ppc64: use the merged syscall table

This allows us to also use entry_64.S from the merged tree and reverts
the setup_64.c part of fda262b8978d0089758ef9444508434c74113a61.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

1 files changed, 5 insertions, 13 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index a8f7ff5ab1a4..950e6f0fea98 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -701,17 +701,6 @@ static void __init emergency_stack_init(void)
                                                 limit)) + PAGE_SIZE;
 }
 
-extern unsigned long *sys_call_table;
-extern unsigned long sys_ni_syscall;
-#ifdef CONFIG_PPC_MERGE
-#define SYS_CALL_ENTRY64(i)     sys_call_table[(i) * 2]
-#define SYS_CALL_ENTRY32(i)     sys_call_table[(i) * 2 + 1]
-#else
-extern unsigned long *sys_call_table32;
-#define SYS_CALL_ENTRY64(i)     sys_call_table[(i)]
-#define SYS_CALL_ENTRY32(i)     sys_call_table32[(i)]
-#endif
-
 /*
  * Called from setup_arch to initialize the bitmap of available
  * syscalls in the systemcfg page
@@ -719,14 +708,17 @@ extern unsigned long *sys_call_table32;
 void __init setup_syscall_map(void)
 {
         unsigned int i, count64 = 0, count32 = 0;
+        extern unsigned long *sys_call_table;
+        extern unsigned long sys_ni_syscall;
+
 
         for (i = 0; i < __NR_syscalls; i++) {
-                if (SYS_CALL_ENTRY64(i) != sys_ni_syscall) {
+                if (sys_call_table[i*2] != sys_ni_syscall) {
                         count64++;
                         systemcfg->syscall_map_64[i >> 5] |=
                                 0x80000000UL >> (i & 0x1f);
                 }
-                if (SYS_CALL_ENTRY32(i) != sys_ni_syscall) {
+                if (sys_call_table[i*2+1] != sys_ni_syscall) {
                         count32++;
                         systemcfg->syscall_map_32[i >> 5] |=
                                 0x80000000UL >> (i & 0x1f);