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: linux-cg/arch/powerpc/kernel/head_64.S
===================================================================
--- linux-cg.orig/arch/powerpc/kernel/head_64.S	2006-07-18 18:17:16.000000000 +0200
+++ linux-cg/arch/powerpc/kernel/head_64.S	2006-07-18 18:17:19.000000000 +0200
@@ -529,7 +529,6 @@
 	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
@@ -537,7 +536,6 @@
 	 */
 	. = 0xf00
 	b	performance_monitor_pSeries
-#endif
 
 	STD_EXCEPTION_PSERIES(0xf20, altivec_unavailable)
 
@@ -555,12 +553,10 @@
 
 	. = 0x3000
 
-#ifndef CONFIG_PPC_CELL
 /*** pSeries interrupt support ***/
 
 	/* moved from 0xf00 */
 	STD_EXCEPTION_PSERIES(., performance_monitor)
-#endif
 
 	.align	7
 _GLOBAL(do_stab_bolted_pSeries)