[PATCH] powerpc/e500mc: Minor tweaks to init/exception code for e500mc

[Kumar Gala]

* PID1/PID2 don't exist on e500mc so we should write them
* Doorbell exceptions need to be taken w/EE still disabled since we use
  them for things like IPIs

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---
 arch/powerpc/kernel/head_fsl_booke.S |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 2f32720..6319973 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -103,7 +103,7 @@ invstr:	mflr	r6				/* Make it accessible */
 	or	r7,r7,r4
 	mtspr	SPRN_MAS6,r7
 	tlbsx	0,r6				/* search MSR[IS], SPID=PID0 */
-#ifndef CONFIG_E200
+#if !defined(CONFIG_E200) && !defined(CONFIG_PPC_E500MC)
 	mfspr	r7,SPRN_MAS1
 	andis.	r7,r7,MAS1_VALID at h
 	bne	match_TLB
@@ -216,7 +216,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
 /* 4. Clear out PIDs & Search info */
 	li	r6,0
 	mtspr	SPRN_PID0,r6
-#ifndef CONFIG_E200
+#if !defined(CONFIG_E200) && !defined(CONFIG_PPC_E500MC)
 	mtspr	SPRN_PID1,r6
 	mtspr	SPRN_PID2,r6
 #endif
@@ -707,7 +707,7 @@ interrupt_base:
 	EXCEPTION(0x2060, PerformanceMonitor, performance_monitor_exception, EXC_XFER_STD)
 
 #ifdef CONFIG_PPC_E500MC
-	EXCEPTION(0x2070, Doorbell, unknown_exception, EXC_XFER_EE)
+	EXCEPTION(0x2070, Doorbell, unknown_exception, EXC_XFER_STD)
 #endif
 
 	/* Debug Interrupt */
-- 
1.5.6.5