diff options
-rw-r--r-- | arch/ppc/kernel/Makefile | 3 | ||||
-rw-r--r-- | arch/ppc/kernel/traps.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index b1457a8a9c0f..1fb92f16acd6 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile | |||
@@ -15,8 +15,9 @@ extra-y += vmlinux.lds | |||
15 | obj-y := entry.o traps.o irq.o idle.o time.o misc.o \ | 15 | obj-y := entry.o traps.o irq.o idle.o time.o misc.o \ |
16 | process.o signal.o ptrace.o align.o \ | 16 | process.o signal.o ptrace.o align.o \ |
17 | semaphore.o syscalls.o setup.o \ | 17 | semaphore.o syscalls.o setup.o \ |
18 | cputable.o ppc_htab.o perfmon.o | 18 | cputable.o ppc_htab.o |
19 | obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o | 19 | obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o |
20 | obj-$(CONFIG_E500) += perfmon.o | ||
20 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o | 21 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o |
21 | obj-$(CONFIG_POWER4) += cpu_setup_power4.o | 22 | obj-$(CONFIG_POWER4) += cpu_setup_power4.o |
22 | obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o | 23 | obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o |
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index d87423d1003a..8356d544fa60 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
@@ -849,10 +849,12 @@ void AltivecAssistException(struct pt_regs *regs) | |||
849 | } | 849 | } |
850 | #endif /* CONFIG_ALTIVEC */ | 850 | #endif /* CONFIG_ALTIVEC */ |
851 | 851 | ||
852 | #ifdef CONFIG_E500 | ||
852 | void PerformanceMonitorException(struct pt_regs *regs) | 853 | void PerformanceMonitorException(struct pt_regs *regs) |
853 | { | 854 | { |
854 | perf_irq(regs); | 855 | perf_irq(regs); |
855 | } | 856 | } |
857 | #endif | ||
856 | 858 | ||
857 | #ifdef CONFIG_FSL_BOOKE | 859 | #ifdef CONFIG_FSL_BOOKE |
858 | void CacheLockingException(struct pt_regs *regs, unsigned long address, | 860 | void CacheLockingException(struct pt_regs *regs, unsigned long address, |