tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] powerpc: Merge asm-ppc*/seccomp.h, drop TIF_32BIT check

Merge asm-ppc*/seccomp.h. Drop TIF_32BIT check.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

Jon Loeliger and committed by
Paul Mackerras 2bfadee3 3efc333e

+3 -18
-10
include/asm-ppc/seccomp.h
··· 1 - #ifndef _ASM_SECCOMP_H 2 - 3 - #include <linux/unistd.h> 4 - 5 - #define __NR_seccomp_read __NR_read 6 - #define __NR_seccomp_write __NR_write 7 - #define __NR_seccomp_exit __NR_exit 8 - #define __NR_seccomp_sigreturn __NR_rt_sigreturn 9 - 10 - #endif /* _ASM_SECCOMP_H */
+3 -8
include/asm-ppc64/seccomp.h include/asm-powerpc/seccomp.h
··· 1 - #ifndef _ASM_SECCOMP_H 1 + #ifndef _ASM_POWERPC_SECCOMP_H 2 2 3 - #include <linux/thread_info.h> /* already defines TIF_32BIT */ 4 - 5 - #ifndef TIF_32BIT 6 - #error "unexpected TIF_32BIT on ppc64" 7 - #endif 8 - 3 + #include <linux/thread_info.h> 9 4 #include <linux/unistd.h> 10 5 11 6 #define __NR_seccomp_read __NR_read ··· 13 18 #define __NR_seccomp_exit_32 __NR_exit 14 19 #define __NR_seccomp_sigreturn_32 __NR_sigreturn 15 20 16 - #endif /* _ASM_SECCOMP_H */ 21 + #endif /* _ASM_POWERPC_SECCOMP_H */