powerpc: make ARCH=ppc use arch/powerpc/kernel/process.c

Commit 5388fb1025443ec223ba556b10efc4c5f83f8682 made signal_32.c
use discard_lazy_cpu_state, which broke ARCH=ppc because that
uses the common signal_32.c but has its own process.c.  Make ARCH=ppc
use the common process.c to fix this and to reduce the amount
of duplicated code.

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

2 files changed, 5 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index bbfa1bdceb4d..a94699d8dc52 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -11,7 +11,8 @@ CFLAGS_btext.o		+= -fPIC
 endif
 
 obj-y                           := semaphore.o cputable.o ptrace.o syscalls.o \
-                                   irq.o align.o signal_32.o pmc.o vdso.o
+                                   irq.o align.o signal_32.o pmc.o vdso.o \
+                                   init_task.o process.o
 obj-y                           += vdso32/
 obj-$(CONFIG_PPC64)             += setup_64.o binfmt_elf32.o sys_ppc32.o \
                                    signal_64.o ptrace32.o systbl.o \
@@ -44,8 +45,7 @@ extra-$(CONFIG_FSL_BOOKE)	:= head_fsl_booke.o
 extra-$(CONFIG_8xx)             := head_8xx.o
 extra-y                         += vmlinux.lds
 
-obj-y                           += process.o init_task.o time.o \
-                                   prom.o traps.o setup-common.o udbg.o
+obj-y                           += time.o prom.o traps.o setup-common.o udbg.o
 obj-$(CONFIG_PPC32)             += entry_32.o setup_32.o misc_32.o systbl.o
 obj-$(CONFIG_PPC64)             += misc_64.o dma_64.o iommu.o
 obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 913f90692a36..9101358cc6b3 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -223,6 +223,7 @@ void discard_lazy_cpu_state(void)
 }
 #endif /* CONFIG_SMP */
 
+#ifdef CONFIG_PPC_MERGE         /* XXX for now */
 int set_dabr(unsigned long dabr)
 {
         if (ppc_md.set_dabr)
@@ -231,6 +232,7 @@ int set_dabr(unsigned long dabr)
         mtspr(SPRN_DABR, dabr);
         return 0;
 }
+#endif
 
 #ifdef CONFIG_PPC64
 DEFINE_PER_CPU(struct cpu_usage, cpu_usage_array);