diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
| commit | 0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch) | |
| tree | f6bdb892cec8ca0df69c08a3477c89f1542999e5 /include/linux/seccomp.h | |
| parent | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (diff) | |
| parent | 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/seccomp.h')
| -rw-r--r-- | include/linux/seccomp.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index dc89116bb1c..cd2773b29a6 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h | |||
| @@ -26,11 +26,7 @@ static inline int has_secure_computing(struct thread_info *ti) | |||
| 26 | 26 | ||
| 27 | #else /* CONFIG_SECCOMP */ | 27 | #else /* CONFIG_SECCOMP */ |
| 28 | 28 | ||
| 29 | #if (__GNUC__ > 2) | 29 | typedef struct { } seccomp_t; |
| 30 | typedef struct { } seccomp_t; | ||
| 31 | #else | ||
| 32 | typedef struct { int gcc_is_buggy; } seccomp_t; | ||
| 33 | #endif | ||
| 34 | 30 | ||
| 35 | #define secure_computing(x) do { } while (0) | 31 | #define secure_computing(x) do { } while (0) |
| 36 | /* static inline to preserve typechecking */ | 32 | /* static inline to preserve typechecking */ |