Remove unneeded _syscallX macros from user view in asm-*/unistd.h

These aren't needed by glibc or klibc, and they're broken in some cases
anyway. The uClibc folks are apparently switching over to stop using
them too (now that we agreed that they should be dropped, at least).

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index ef932f1cddc..bd3c6b6cc50 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -305,12 +305,12 @@
 #define __NR_tee                284
 #define __NR_vmsplice           285
 
+#ifdef __KERNEL__
+
 #define __NR_syscalls           286
 
-#ifdef __KERNEL__
 #define __NR__exit __NR_exit
 #define NR_syscalls     __NR_syscalls
-#endif
 
 #ifndef __ASSEMBLY__
 
@@ -422,7 +422,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6
         __syscall_nr(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6); \
 }
 
-#ifdef __KERNEL__
 
 #include <linux/types.h>
 #include <linux/compiler.h>
@@ -478,8 +477,8 @@ extern int execve(const char *file, char **argv, char **envp);
 #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall")
 #endif
 
-#endif          /* __KERNEL__ */
 
 #endif          /* __ASSEMBLY__ */
+#endif          /* __KERNEL__ */
 
 #endif /* _ASM_PPC_UNISTD_H_ */