powerpc: Fix various compile errors with ARCH=ppc, ppc64 and powerpc

This makes ppc use the syscalls.c from arch/powerpc/kernel, exports
copy_and_flush from head_32.S for use by prom_init.c (ARCH=powerpc),
and consolidates the sys_fadvise64_64 implementations for 32-bit.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 043ddd09521d..01b6d630edc9 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -10,7 +10,8 @@ CFLAGS_prom_init.o      += -fPIC
 CFLAGS_btext.o          += -fPIC
 endif
 
-obj-y                           := semaphore.o cputable.o ptrace.o signal_32.o
+obj-y                           := semaphore.o cputable.o ptrace.o syscalls.o \
+                                   signal_32.o
 obj-$(CONFIG_PPC64)             += binfmt_elf32.o sys_ppc32.o
 obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
 obj-$(CONFIG_POWER4)            += idle_power4.o
@@ -24,14 +25,13 @@ 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_6xx)             += idle_6xx.o
 extra-$(CONFIG_PPC64)           += entry_64.o
 extra-$(CONFIG_PPC_FPU)         += fpu.o
 extra-y                         += vmlinux.lds
 
 obj-y                           += process.o init_task.o \
-                                   prom.o systbl.o traps.o syscalls.o
-obj-$(CONFIG_PPC32)             += entry_32.o setup_32.o misc_32.o
+                                   prom.o systbl.o traps.o
+obj-$(CONFIG_PPC32)             += entry_32.o idle_6xx.o setup_32.o misc_32.o
 obj-$(CONFIG_PPC64)             += setup_64.o misc_64.o
 obj-$(CONFIG_PPC_OF)            += prom_init.o
 obj-$(CONFIG_MODULES)           += ppc_ksyms.o
@@ -44,7 +44,7 @@ endif
 
 else
 # stuff used from here for ARCH=ppc or ARCH=ppc64
-obj-$(CONFIG_PPC64)             += traps.o process.o init_task.o syscalls.o
+obj-$(CONFIG_PPC64)             += traps.o process.o init_task.o
 
 fpux-$(CONFIG_PPC32)            += fpu.o
 extra-$(CONFIG_PPC_FPU)         += $(fpux-y)