Subject: small cleanup for cell perfmon support
From: David Erb <djerb@us.ibm.com>

The cell perfmon patch was disabling some code when
compiling for cell, which was wrong in case of buiding
a combined kernel image.

This reverts that change.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Index: linus-2.6/arch/powerpc/kernel/head_64.S
===================================================================
--- linus-2.6.orig/arch/powerpc/kernel/head_64.S
+++ linus-2.6/arch/powerpc/kernel/head_64.S
@@ -557,7 +557,6 @@ system_call_pSeries:
 	STD_EXCEPTION_PSERIES(0xd00, single_step)
 	STD_EXCEPTION_PSERIES(0xe00, trap_0e)
 
-#ifndef CONFIG_PPC_CELL
 	/* We need to deal with the Altivec unavailable exception
 	 * here which is at 0xf20, thus in the middle of the
 	 * prolog code of the PerformanceMonitor one. A little
@@ -565,7 +564,6 @@ system_call_pSeries:
 	 */
 	. = 0xf00
 	b	performance_monitor_pSeries
-#endif
 
 	STD_EXCEPTION_PSERIES(0xf20, altivec_unavailable)
 
@@ -583,12 +581,10 @@ system_call_pSeries:
 
 	. = 0x3000
 
-#ifndef CONFIG_PPC_CELL
 /*** pSeries interrupt support ***/
 
 	/* moved from 0xf00 */
 	STD_EXCEPTION_PSERIES(., performance_monitor)
-#endif
 
 	.align	7
 _GLOBAL(do_stab_bolted_pSeries)
@@ -855,9 +851,7 @@ machine_check_common:
 	STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception)
 	STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception)
 	STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception)
-#ifndef CONFIG_PPC_CELL
 	STD_EXCEPTION_COMMON(0xf00, performance_monitor, .performance_monitor_exception)
-#endif
 	STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception)
 #ifdef CONFIG_ALTIVEC
 	STD_EXCEPTION_COMMON(0x1700, altivec_assist, .altivec_assist_exception)
Index: linus-2.6/arch/powerpc/kernel/traps.c
===================================================================
--- linus-2.6.orig/arch/powerpc/kernel/traps.c
+++ linus-2.6/arch/powerpc/kernel/traps.c
@@ -905,12 +905,10 @@ void altivec_unavailable_exception(struc
 	die("Unrecoverable VMX/Altivec Unavailable Exception", regs, SIGABRT);
 }
 
-#ifndef CONFIG_PPC_CELL
 void performance_monitor_exception(struct pt_regs *regs)
 {
 	perf_irq(regs);
 }
-#endif
 
 #ifdef CONFIG_8xx
 void SoftwareEmulation(struct pt_regs *regs)