diff options
author | Paul Mackerras <paulus@samba.org> | 2006-01-12 05:22:34 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-12 05:22:34 -0500 |
commit | 624cee31bcb14bfd85559fbec5dd7bb833542965 (patch) | |
tree | f9e428498d88618f4f28b974a51591481ccfed0b /arch/powerpc/kernel/Makefile | |
parent | 8fce10a3c9ee7f9c74d83502fd5156a8ec82c21a (diff) |
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>
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 6 |
1 files changed, 3 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 | |||
11 | endif | 11 | endif |
12 | 12 | ||
13 | obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ | 13 | obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ |
14 | irq.o align.o signal_32.o pmc.o vdso.o | 14 | irq.o align.o signal_32.o pmc.o vdso.o \ |
15 | init_task.o process.o | ||
15 | obj-y += vdso32/ | 16 | obj-y += vdso32/ |
16 | obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ | 17 | obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ |
17 | signal_64.o ptrace32.o systbl.o \ | 18 | signal_64.o ptrace32.o systbl.o \ |
@@ -44,8 +45,7 @@ extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o | |||
44 | extra-$(CONFIG_8xx) := head_8xx.o | 45 | extra-$(CONFIG_8xx) := head_8xx.o |
45 | extra-y += vmlinux.lds | 46 | extra-y += vmlinux.lds |
46 | 47 | ||
47 | obj-y += process.o init_task.o time.o \ | 48 | obj-y += time.o prom.o traps.o setup-common.o udbg.o |
48 | prom.o traps.o setup-common.o udbg.o | ||
49 | obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o systbl.o | 49 | obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o systbl.o |
50 | obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o | 50 | obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o |
51 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o | 51 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o |