2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
index 32a56c6dfa72..f7a487231a11 100644
--- a/arch/powerpc/platforms/iseries/exception.S
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -155,7 +155,7 @@ BEGIN_FTR_SECTION
        std     r12,PACA_EXGEN+EX_R13(r13)
        EXCEPTION_PROLOG_ISERIES_1
 FTR_SECTION_ELSE
-        EXCEPTION_PROLOG_1(PACA_EXGEN)
+        EXCEPTION_PROLOG_1(PACA_EXGEN, EXC_STD)
        EXCEPTION_PROLOG_ISERIES_1
 ALT_FTR_SECTION_END_IFCLR(CPU_FTR_SLB)
        b       data_access_common
diff --git a/arch/powerpc/platforms/iseries/exception.h b/arch/powerpc/platforms/iseries/exception.h
index bae3fba5ad8e..57127d805fe3 100644
--- a/arch/powerpc/platforms/iseries/exception.h
+++ b/arch/powerpc/platforms/iseries/exception.h
@@ -39,7 +39,7 @@
 label##_iSeries:                                                        \
        HMT_MEDIUM;                                                     \
        mtspr   SPRN_SPRG_SCRATCH0,r13; /* save r13 */                  \
-        EXCEPTION_PROLOG_1(area);                                       \
+        EXCEPTION_PROLOG_1(area, EXC_STD);                              \
        EXCEPTION_PROLOG_ISERIES_1;                                     \
        b       label##_common
@@ -48,7 +48,7 @@ label##_iSeries:							\
 label##_iSeries:                                                        \
        HMT_MEDIUM;                                                     \
        mtspr   SPRN_SPRG_SCRATCH0,r13; /* save r13 */                  \
-        EXCEPTION_PROLOG_1(PACA_EXGEN);                                 \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, EXC_STD);                        \
        lbz     r10,PACASOFTIRQEN(r13);                                 \
        cmpwi   0,r10,0;                                                \
        beq-    label##_iSeries_masked;                                 \

diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S index 32a56c6dfa72..f7a487231a11 100644 --- a/arch/powerpc/platforms/iseries/exception.S +++ b/arch/powerpc/platforms/iseries/exception.S
@@ -155,7 +155,7 @@ BEGIN_FTR_SECTION
155	std r12,PACA_EXGEN+EX_R13(r13)	155	std r12,PACA_EXGEN+EX_R13(r13)
156	EXCEPTION_PROLOG_ISERIES_1	156	EXCEPTION_PROLOG_ISERIES_1
157	FTR_SECTION_ELSE	157	FTR_SECTION_ELSE
158	EXCEPTION_PROLOG_1(PACA_EXGEN)	158	EXCEPTION_PROLOG_1(PACA_EXGEN, EXC_STD)
159	EXCEPTION_PROLOG_ISERIES_1	159	EXCEPTION_PROLOG_ISERIES_1
160	ALT_FTR_SECTION_END_IFCLR(CPU_FTR_SLB)	160	ALT_FTR_SECTION_END_IFCLR(CPU_FTR_SLB)
161	b data_access_common	161	b data_access_common


diff --git a/arch/powerpc/platforms/iseries/exception.h b/arch/powerpc/platforms/iseries/exception.h index bae3fba5ad8e..57127d805fe3 100644 --- a/arch/powerpc/platforms/iseries/exception.h +++ b/arch/powerpc/platforms/iseries/exception.h
@@ -39,7 +39,7 @@
39	label##_iSeries: \	39	label##_iSeries: \
40	HMT_MEDIUM; \	40	HMT_MEDIUM; \
41	mtspr SPRN_SPRG_SCRATCH0,r13; /* save r13 */ \	41	mtspr SPRN_SPRG_SCRATCH0,r13; /* save r13 */ \
42	EXCEPTION_PROLOG_1(area); \	42	EXCEPTION_PROLOG_1(area, EXC_STD); \
43	EXCEPTION_PROLOG_ISERIES_1; \	43	EXCEPTION_PROLOG_ISERIES_1; \
44	b label##_common	44	b label##_common
45		45
@@ -48,7 +48,7 @@ label##_iSeries: \
48	label##_iSeries: \	48	label##_iSeries: \
49	HMT_MEDIUM; \	49	HMT_MEDIUM; \
50	mtspr SPRN_SPRG_SCRATCH0,r13; /* save r13 */ \	50	mtspr SPRN_SPRG_SCRATCH0,r13; /* save r13 */ \
51	EXCEPTION_PROLOG_1(PACA_EXGEN); \	51	EXCEPTION_PROLOG_1(PACA_EXGEN, EXC_STD); \
52	lbz r10,PACASOFTIRQEN(r13); \	52	lbz r10,PACASOFTIRQEN(r13); \
53	cmpwi 0,r10,0; \	53	cmpwi 0,r10,0; \
54	beq- label##_iSeries_masked; \	54	beq- label##_iSeries_masked; \