git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
include
/
linux
/
seccomp.h
diff --git
a/include/linux/seccomp.h
b/include/linux/seccomp.h
index
3e8b1cf
..
262a8dc
100644
(file)
--- a/
include/linux/seccomp.h
+++ b/
include/linux/seccomp.h
@@
-4,8
+4,6
@@
#ifdef CONFIG_SECCOMP
#ifdef CONFIG_SECCOMP
-#define NR_SECCOMP_MODES 1
-
#include <linux/thread_info.h>
#include <asm/seccomp.h>
#include <linux/thread_info.h>
#include <asm/seccomp.h>
@@
-18,20
+16,23
@@
static inline void secure_computing(int this_syscall)
__secure_computing(this_syscall);
}
__secure_computing(this_syscall);
}
-static inline int has_secure_computing(struct thread_info *ti)
-{
- return unlikely(test_ti_thread_flag(ti, TIF_SECCOMP));
-}
+extern long prctl_get_seccomp(void);
+extern long prctl_set_seccomp(unsigned long);
#else /* CONFIG_SECCOMP */
typedef struct { } seccomp_t;
#define secure_computing(x) do { } while (0)
#else /* CONFIG_SECCOMP */
typedef struct { } seccomp_t;
#define secure_computing(x) do { } while (0)
-/* static inline to preserve typechecking */
-static inline int has_secure_computing(struct thread_info *ti)
+
+static inline long prctl_get_seccomp(void)
+{
+ return -EINVAL;
+}
+
+static inline long prctl_set_seccomp(unsigned long arg2)
{
{
- return
0
;
+ return
-EINVAL
;
}
#endif /* CONFIG_SECCOMP */
}
#endif /* CONFIG_SECCOMP */