powerpc/64s: Remove PSERIES from the NORI macros

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 0d798d6..d6f058b 100644 (file)
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -330,7 +330,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
        __EXCEPTION_PROLOG_2(label, h)
 
 /* _NORI variant keeps MSR_RI clear */
-#define __EXCEPTION_PROLOG_PSERIES_1_NORI(label, h)                    \
+#define __EXCEPTION_PROLOG_2_NORI(label, h)                            \
        ld      r10,PACAKMSR(r13);      /* get MSR value for kernel */  \
        xori    r10,r10,MSR_RI;         /* Clear MSR_RI */              \
        mfspr   r11,SPRN_##h##SRR0;     /* save SRR0 */                 \
@@ -341,8 +341,8 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
        h##RFI_TO_KERNEL;                                               \
        b       .       /* prevent speculative execution */
 
-#define EXCEPTION_PROLOG_PSERIES_1_NORI(label, h)                      \
-       __EXCEPTION_PROLOG_PSERIES_1_NORI(label, h)
+#define EXCEPTION_PROLOG_2_NORI(label, h)                              \
+       __EXCEPTION_PROLOG_2_NORI(label, h)
 
 #define EXCEPTION_PROLOG_PSERIES(area, label, h, extra, vec)           \
        SET_SCRATCH0(r13);              /* save r13 */                  \
@@ -419,10 +419,10 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 #endif
 
 /* Do not enable RI */
-#define EXCEPTION_PROLOG_PSERIES_NORI(area, label, h, extra, vec)      \
+#define EXCEPTION_PROLOG_NORI(area, label, h, extra, vec)              \
        EXCEPTION_PROLOG_0(area);                                       \
        EXCEPTION_PROLOG_1(area, extra, vec);                           \
-       EXCEPTION_PROLOG_PSERIES_1_NORI(label, h);
+       EXCEPTION_PROLOG_2_NORI(label, h);
 
 
 #define __KVM_HANDLER(area, h, n)                                      \

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 21cdea3..373f6ea 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -127,8 +127,8 @@ EXC_REAL_BEGIN(system_reset, 0x100, 0x100)
         * MSR_RI is not enabled, because PACA_EXNMI and nmi stack is
         * being used, so a nested NMI exception would corrupt it.
         */
-       EXCEPTION_PROLOG_PSERIES_NORI(PACA_EXNMI, system_reset_common, EXC_STD,
-                                IDLETEST, 0x100)
+       EXCEPTION_PROLOG_NORI(PACA_EXNMI, system_reset_common, EXC_STD,
+                             IDLETEST, 0x100)
 
 EXC_REAL_END(system_reset, 0x100, 0x100)
 EXC_VIRT_NONE(0x4100, 0x100)
@@ -231,8 +231,8 @@ EXC_COMMON_BEGIN(system_reset_common)
 TRAMP_REAL_BEGIN(system_reset_fwnmi)
        SET_SCRATCH0(r13)               /* save r13 */
        /* See comment at system_reset exception */
-       EXCEPTION_PROLOG_PSERIES_NORI(PACA_EXNMI, system_reset_common,
-                                               EXC_STD, NOTEST, 0x100)
+       EXCEPTION_PROLOG_NORI(PACA_EXNMI, system_reset_common, EXC_STD,
+                             NOTEST, 0x100)
 #endif /* CONFIG_PPC_PSERIES */
 
 
@@ -338,7 +338,7 @@ machine_check_pSeries_0:
         * nested machine check corrupts it. machine_check_common enables
         * MSR_RI.
         */
-       EXCEPTION_PROLOG_PSERIES_1_NORI(machine_check_common, EXC_STD)
+       EXCEPTION_PROLOG_2_NORI(machine_check_common, EXC_STD)
 
 TRAMP_KVM_SKIP(PACA_EXMC, 0x200)