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>
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 6854320..0118e51 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -13,7 +13,7 @@
obj-y := semaphore.o cputable.o ptrace.o syscalls.o \
signal_32.o pmc.o
obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \
- ptrace32.o
+ ptrace32.o systbl.o
obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
obj-$(CONFIG_POWER4) += idle_power4.o
obj-$(CONFIG_PPC_OF) += of_device.o
@@ -28,12 +28,12 @@
extra-$(CONFIG_44x) := head_44x.o
extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o
extra-$(CONFIG_8xx) := head_8xx.o
-extra-$(CONFIG_PPC64) += entry_64.o
extra-y += vmlinux.lds
obj-y += process.o init_task.o time.o \
- prom.o systbl.o traps.o setup-common.o
-obj-$(CONFIG_PPC32) += entry_32.o idle_6xx.o setup_32.o misc_32.o
+ prom.o traps.o setup-common.o
+obj-$(CONFIG_PPC32) += entry_32.o idle_6xx.o setup_32.o misc_32.o \
+ systbl.o
obj-$(CONFIG_PPC64) += misc_64.o
obj-$(CONFIG_PPC_OF) += prom_init.o
obj-$(CONFIG_MODULES) += ppc_ksyms.o
@@ -53,3 +53,4 @@
endif
extra-$(CONFIG_PPC_FPU) += fpu.o
+extra-$(CONFIG_PPC64) += entry_64.o
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index a8f7ff5..950e6f0 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -701,17 +701,6 @@
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 @@
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);