From 1561a646acc877fca75eb8d0fb03c46b5cdfadbd Mon Sep 17 00:00:00 2001
From: Bharat Bhushan <r65777@freescale.com>
Date: Mon, 29 Apr 2013 22:18:11 +0000
Subject: [PATCH] --- yaml --- r: 370895 b: refs/heads/master c:
 fc2a6cfe05a33891180a27d55983febe170bc0f8 h: refs/heads/master i:   370893:
 c6c4fd35f95494c40d85c22c2c5b71448d002697   370891:
 92bd4289c075a9d72d37931d373139c84b4908c2   370887:
 06ffbc9e04286bee11442d08a32002b8cd589ace   370879:
 c17c79fbbd0875892e10ade0d1f65125b401a1f7 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/powerpc/kernel/head_44x.S       |  2 ++
 trunk/arch/powerpc/kernel/head_booke.h     | 16 ++++++++--------
 trunk/arch/powerpc/kernel/head_fsl_booke.S |  2 ++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index c8502ee31ad8..acbe4c63d6e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f6aaaccb1b3af8613fe45781c1aefee2ae8c6b3
+refs/heads/master: fc2a6cfe05a33891180a27d55983febe170bc0f8
diff --git a/trunk/arch/powerpc/kernel/head_44x.S b/trunk/arch/powerpc/kernel/head_44x.S
index 7a2e5e421abf..97e2671cde7f 100644
--- a/trunk/arch/powerpc/kernel/head_44x.S
+++ b/trunk/arch/powerpc/kernel/head_44x.S
@@ -769,6 +769,8 @@ finish_tlb_load_47x:
 	 */
 	DEBUG_CRIT_EXCEPTION
 
+interrupt_end:
+
 /*
  * Global functions
  */
diff --git a/trunk/arch/powerpc/kernel/head_booke.h b/trunk/arch/powerpc/kernel/head_booke.h
index b3853504498d..a620203f7de3 100644
--- a/trunk/arch/powerpc/kernel/head_booke.h
+++ b/trunk/arch/powerpc/kernel/head_booke.h
@@ -281,13 +281,13 @@
 	andis.	r10,r10,(DBSR_IC|DBSR_BT)@h;				      \
 	beq+	2f;							      \
 									      \
-	lis	r10,KERNELBASE@h;	/* check if exception in vectors */   \
-	ori	r10,r10,KERNELBASE@l;					      \
+	lis	r10,interrupt_base@h;	/* check if exception in vectors */   \
+	ori	r10,r10,interrupt_base@l;				      \
 	cmplw	r12,r10;						      \
 	blt+	2f;			/* addr below exception vectors */    \
 									      \
-	lis	r10,DebugDebug@h;					      \
-	ori	r10,r10,DebugDebug@l;					      \
+	lis	r10,interrupt_end@h;					      \
+	ori	r10,r10,interrupt_end@l;				      \
 	cmplw	r12,r10;						      \
 	bgt+	2f;			/* addr above exception vectors */    \
 									      \
@@ -334,13 +334,13 @@
 	andis.	r10,r10,(DBSR_IC|DBSR_BT)@h;				      \
 	beq+	2f;							      \
 									      \
-	lis	r10,KERNELBASE@h;	/* check if exception in vectors */   \
-	ori	r10,r10,KERNELBASE@l;					      \
+	lis	r10,interrupt_base@h;	/* check if exception in vectors */   \
+	ori	r10,r10,interrupt_base@l;				      \
 	cmplw	r12,r10;						      \
 	blt+	2f;			/* addr below exception vectors */    \
 									      \
-	lis	r10,DebugCrit@h;					      \
-	ori	r10,r10,DebugCrit@l;					      \
+	lis	r10,interrupt_end@h;					      \
+	ori	r10,r10,interrupt_end@l;				      \
 	cmplw	r12,r10;						      \
 	bgt+	2f;			/* addr above exception vectors */    \
 									      \
diff --git a/trunk/arch/powerpc/kernel/head_fsl_booke.S b/trunk/arch/powerpc/kernel/head_fsl_booke.S
index 6f62a737f607..d10a7cacccd2 100644
--- a/trunk/arch/powerpc/kernel/head_fsl_booke.S
+++ b/trunk/arch/powerpc/kernel/head_fsl_booke.S
@@ -605,6 +605,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV)
 	/* Embedded Hypervisor Privilege */
 	EXCEPTION(0, HV_PRIV, Ehvpriv, unknown_exception, EXC_XFER_EE)
 
+interrupt_end:
+
 /*
  * Local functions
  */