diff options
| author | Jon Loeliger <jdl@freescale.com> | 2005-09-23 08:05:03 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 22:38:45 +1000 |
| commit | 2bfadee32f1501faa3184d574f6a769f17236c87 (patch) | |
| tree | c90a7261ffa59312459666f2917f1882c8a3f320 | |
| parent | 3efc333e7fdb6fab9d4eae129e2b249c6483b250 (diff) | |
| download | blackbird-op-linux-2bfadee32f1501faa3184d574f6a769f17236c87.tar.gz blackbird-op-linux-2bfadee32f1501faa3184d574f6a769f17236c87.zip | |
[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>
| -rw-r--r-- | include/asm-powerpc/seccomp.h (renamed from include/asm-ppc64/seccomp.h) | 11 | ||||
| -rw-r--r-- | include/asm-ppc/seccomp.h | 10 |
2 files changed, 3 insertions, 18 deletions
diff --git a/include/asm-ppc64/seccomp.h b/include/asm-powerpc/seccomp.h index c130c334bda1..1e1cfe12882b 100644 --- a/include/asm-ppc64/seccomp.h +++ b/include/asm-powerpc/seccomp.h @@ -1,11 +1,6 @@ -#ifndef _ASM_SECCOMP_H - -#include <linux/thread_info.h> /* already defines TIF_32BIT */ - -#ifndef TIF_32BIT -#error "unexpected TIF_32BIT on ppc64" -#endif +#ifndef _ASM_POWERPC_SECCOMP_H +#include <linux/thread_info.h> #include <linux/unistd.h> #define __NR_seccomp_read __NR_read @@ -18,4 +13,4 @@ #define __NR_seccomp_exit_32 __NR_exit #define __NR_seccomp_sigreturn_32 __NR_sigreturn -#endif /* _ASM_SECCOMP_H */ +#endif /* _ASM_POWERPC_SECCOMP_H */ diff --git a/include/asm-ppc/seccomp.h b/include/asm-ppc/seccomp.h deleted file mode 100644 index 666c4da96d87..000000000000 --- a/include/asm-ppc/seccomp.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _ASM_SECCOMP_H - -#include <linux/unistd.h> - -#define __NR_seccomp_read __NR_read -#define __NR_seccomp_write __NR_write -#define __NR_seccomp_exit __NR_exit -#define __NR_seccomp_sigreturn __NR_rt_sigreturn - -#endif /* _ASM_SECCOMP_H */ |
