From 68b8f0fba87335d2ea44a0df9acb3d4cea8edae7 Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Fri, 23 Sep 2005 08:05:03 -0500
Subject: [PATCH] --- yaml --- r: 11455 b: refs/heads/master c:
 2bfadee32f1501faa3184d574f6a769f17236c87 h: refs/heads/master i:   11453:
 3124c6ca04046e12a5374e5b85d346d3bdd94d3e   11451:
 ebc521e9d2b7d97b4d9b599f31a333b25a76d12e   11447:
 cfadb258888bddc562678c496fc93eb00b553f20   11439:
 0be957947e8a047a133f037c9cbeeb1346a0d80c   11423:
 f2b5cd3ed3011d738a878df9a80502fc51ac4156   11391:
 ca85b3ab6ca642991616b8e063f8e4fa65688d1f v: v3

---
 [refs]                                             |  2 +-
 trunk/include/{asm-ppc64 => asm-powerpc}/seccomp.h | 11 +++--------
 trunk/include/asm-ppc/seccomp.h                    | 10 ----------
 3 files changed, 4 insertions(+), 19 deletions(-)
 rename trunk/include/{asm-ppc64 => asm-powerpc}/seccomp.h (66%)
 delete mode 100644 trunk/include/asm-ppc/seccomp.h

diff --git a/[refs] b/[refs]
index f764b6787ed8..6dfa44238675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3efc333e7fdb6fab9d4eae129e2b249c6483b250
+refs/heads/master: 2bfadee32f1501faa3184d574f6a769f17236c87
diff --git a/trunk/include/asm-ppc64/seccomp.h b/trunk/include/asm-powerpc/seccomp.h
similarity index 66%
rename from trunk/include/asm-ppc64/seccomp.h
rename to trunk/include/asm-powerpc/seccomp.h
index c130c334bda1..1e1cfe12882b 100644
--- a/trunk/include/asm-ppc64/seccomp.h
+++ b/trunk/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/trunk/include/asm-ppc/seccomp.h b/trunk/include/asm-ppc/seccomp.h
deleted file mode 100644
index 666c4da96d87..000000000000
--- a/trunk/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 */