diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-17 11:21:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-17 11:21:20 -0400 |
| commit | 47239561e39bceefecc3cd67f71fcf86a198a8ff (patch) | |
| tree | 9823d0973494ea8acabb744bc3aba42b610fb434 /arch/mips/include/asm/seccomp.h | |
| parent | ed681a91ab805341675d166a9592551093c0a2d9 (diff) | |
| parent | 5bee17f18b595937e6beafeee5197868a3f74a06 (diff) | |
Merge branch 'linus' into core/printk
Diffstat (limited to 'arch/mips/include/asm/seccomp.h')
| -rw-r--r-- | arch/mips/include/asm/seccomp.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mips/include/asm/seccomp.h b/arch/mips/include/asm/seccomp.h index 36ed44070256..ae6306ebdcad 100644 --- a/arch/mips/include/asm/seccomp.h +++ b/arch/mips/include/asm/seccomp.h | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #ifndef __ASM_SECCOMP_H | 1 | #ifndef __ASM_SECCOMP_H |
| 2 | 2 | ||
| 3 | #include <linux/thread_info.h> | ||
| 4 | #include <linux/unistd.h> | 3 | #include <linux/unistd.h> |
| 5 | 4 | ||
| 6 | #define __NR_seccomp_read __NR_read | 5 | #define __NR_seccomp_read __NR_read |
| @@ -16,8 +15,6 @@ | |||
| 16 | */ | 15 | */ |
| 17 | #ifdef CONFIG_MIPS32_O32 | 16 | #ifdef CONFIG_MIPS32_O32 |
| 18 | 17 | ||
| 19 | #define TIF_32BIT TIF_32BIT_REGS | ||
| 20 | |||
| 21 | #define __NR_seccomp_read_32 4003 | 18 | #define __NR_seccomp_read_32 4003 |
| 22 | #define __NR_seccomp_write_32 4004 | 19 | #define __NR_seccomp_write_32 4004 |
| 23 | #define __NR_seccomp_exit_32 4001 | 20 | #define __NR_seccomp_exit_32 4001 |
| @@ -25,8 +22,6 @@ | |||
| 25 | 22 | ||
| 26 | #elif defined(CONFIG_MIPS32_N32) | 23 | #elif defined(CONFIG_MIPS32_N32) |
| 27 | 24 | ||
| 28 | #define TIF_32BIT _TIF_32BIT_ADDR | ||
| 29 | |||
| 30 | #define __NR_seccomp_read_32 6000 | 25 | #define __NR_seccomp_read_32 6000 |
| 31 | #define __NR_seccomp_write_32 6001 | 26 | #define __NR_seccomp_write_32 6001 |
| 32 | #define __NR_seccomp_exit_32 6058 | 27 | #define __NR_seccomp_exit_32 6058 |