aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/seccomp.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-04-20 15:59:09 -0400
committerSteve French <sfrench@us.ibm.com>2009-04-20 15:59:09 -0400
commitcbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch)
tree65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /include/linux/seccomp.h
parent7b0c8fcff47a885743125dd843db64af41af5a61 (diff)
parenta939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/seccomp.h')
-rw-r--r--include/linux/seccomp.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
index 262a8dccfa81..167c33361d9c 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -21,6 +21,8 @@ extern long prctl_set_seccomp(unsigned long);
21 21
22#else /* CONFIG_SECCOMP */ 22#else /* CONFIG_SECCOMP */
23 23
24#include <linux/errno.h>
25
24typedef struct { } seccomp_t; 26typedef struct { } seccomp_t;
25 27
26#define secure_computing(x) do { } while (0) 28#define secure_computing(x) do { } while (0)