Merge git://oak/home/sfr/kernels/iseries/work/

3 files changed, 17 insertions, 21 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 8421f1975dad..572d4f5eaacb 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -13,7 +13,7 @@ endif
 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,11 @@ extra-$(CONFIG_40x)		:= head_4xx.o
 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 setup_32.o misc_32.o
+                                   prom.o traps.o setup-common.o
+obj-$(CONFIG_PPC32)             += entry_32.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
@@ -54,3 +53,4 @@ obj-$(CONFIG_PPC64)		+= traps.o process.o init_task.o time.o \
 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 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);
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 30367a0237dd..0115bf96751c 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -2,12 +2,16 @@
 # Makefile for ppc-specific library files..
 #
 
-obj-y                   := strcase.o string.o
+ifeq ($(CONFIG_PPC_MERGE),y)
+obj-y                   := string.o
+endif
+
+obj-y                   += strcase.o
 obj-$(CONFIG_PPC32)     += div64.o copy_32.o checksum_32.o
-obj-$(CONFIG_PPC64)     += copypage_64.o copyuser_64.o memcpy_64.o \
-                           usercopy_64.o sstep.o checksum_64.o mem_64.o
+obj-$(CONFIG_PPC64)     += checksum_64.o copypage_64.o copyuser_64.o \
+                           memcpy_64.o usercopy_64.o mem_64.o
 obj-$(CONFIG_PPC_ISERIES) += e2a.o
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)       += locks.o
+obj-$(CONFIG_DEBUG_KERNEL) += sstep.o
 endif
-