Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83f7da8a authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Linus Torvalds
Browse files

[PATCH] ppc32: make perfmon.o CONFIG_E500 specific 



Subject says it all, there is no need to link perfmon.o on
sub-architectures other than CONFIG_E500.

Signed-off-by: default avatarMarcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e31e14ec

arch/ppc/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ extra-y += vmlinux.lds 
obj-y				:= entry.o traps.o irq.o idle.o time.o misc.o \

					process.o signal.o ptrace.o align.o \

					semaphore.o syscalls.o setup.o \

					cputable.o ppc_htab.o perfmon.o

					cputable.o ppc_htab.o

obj-$(CONFIG_6xx)		+= l2cr.o cpu_setup_6xx.o

obj-$(CONFIG_E500)		+= perfmon.o

obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o

obj-$(CONFIG_POWER4)		+= cpu_setup_power4.o

obj-$(CONFIG_MODULES)		+= module.o ppc_ksyms.o

arch/ppc/kernel/traps.c

+2 −0
Original line number Diff line number Diff line
@@ -849,10 +849,12 @@ void AltivecAssistException(struct pt_regs *regs) 
}

#endif /* CONFIG_ALTIVEC */



#ifdef CONFIG_E500

void PerformanceMonitorException(struct pt_regs *regs)

{

	perf_irq(regs);

}

#endif



#ifdef CONFIG_FSL_BOOKE

void CacheLockingException(struct pt_regs *regs, unsigned long address,