Revert "CHROMIUM: Fix seccomp_t compile error"
authorLeann Ogasawara <leann.ogasawara@canonical.com>
Fri, 27 Jan 2012 19:35:49 +0000 (11:35 -0800)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 2 Apr 2012 20:18:39 +0000 (13:18 -0700)
This reverts commit 16273e2ded4e16ecc74cc3890936fabf58abfc92.

https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html

"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

include/linux/seccomp.h

index 580b914..d8ace69 100644 (file)
@@ -41,7 +41,7 @@ static inline void secure_computing(int this_syscall)
 extern long prctl_get_seccomp(void);
 extern long prctl_set_seccomp(unsigned long);
 
-static inline int seccomp_mode(struct seccomp_struct *s)
+static inline int seccomp_mode(seccomp_t *s)
 {
        return s->mode;
 }
@@ -63,7 +63,7 @@ static inline long prctl_set_seccomp(unsigned long arg2)
        return -EINVAL;
 }
 
-static inline int seccomp_mode(struct seccomp_struct *s)
+static inline int seccomp_mode(seccomp_t *s)
 {
        return 0;
 }