ppc64: Someone removed NR_syscalls from <linux/sys.h>

diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S
index 18c7c84b207a1bac105925fe164529fb77605358..afab364535eafd9b66961efee28f1b3db4e2bad0 100644 (file)
--- a/arch/ppc64/kernel/entry.S
+++ b/arch/ppc64/kernel/entry.S
@@ -22,7 +22,7 @@
 
 #include <linux/config.h>
 #include <linux/errno.h>
-#include <linux/sys.h>
+#include <asm/unistd.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/mmu.h>

diff --git a/include/asm-ppc64/unistd.h b/include/asm-ppc64/unistd.h
index 249347ee12d2cc9891d3ffc368b7d7c0e4b708d7..f4d465ae4f173c851cc450f9c5142418d1ede7ce 100644 (file)
--- a/include/asm-ppc64/unistd.h
+++ b/include/asm-ppc64/unistd.h
@@ -251,6 +251,9 @@
 #define __NR_sys_epoll_wait    238
 #define __NR_remap_file_pages  239
 
+#define NR_syscalls            260
+
+#ifndef __ASSEMBLY__
 #ifdef __KERNEL_SYSCALLS__
 
 /*
@@ -284,4 +287,6 @@ extern pid_t waitpid(pid_t pid, int *wait_stat, int options);
  */
 #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall");
 
+#endif         /* __ASSEMBLY__ */
+
 #endif /* _ASM_PPC_UNISTD_H_ */