powerpc/64s: Avoid using EXCEPTION_PROLOG_1 macro in MASKABLE_*

Currently we use both EXCEPTION_PROLOG_1 and __EXCEPTION_PROLOG_1 in
the MASKABLE_* macros. As a cleanup, this patch makes MASKABLE_* to
use only __EXCEPTION_PROLOG_1. There is not logic change.

Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
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 b090db4ca37e044f3b74a8b3a098fc7d0e9d2c8e..593d7f9da5da1c695d9b38676bc58af223f5be55 100644 (file)
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -536,7 +536,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
                                    EXC_STD, SOFTEN_TEST_PR)
 
 #define MASKABLE_EXCEPTION_PSERIES_OOL(vec, label)                     \
-       EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_PR, vec);            \
+       __EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_PR, vec);          \
        EXCEPTION_PROLOG_PSERIES_1(label, EXC_STD)
 
 #define MASKABLE_EXCEPTION_HV(loc, vec, label)                         \
@@ -544,7 +544,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
                                    EXC_HV, SOFTEN_TEST_HV)
 
 #define MASKABLE_EXCEPTION_HV_OOL(vec, label)                          \
-       EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec);            \
+       __EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec);          \
        EXCEPTION_PROLOG_PSERIES_1(label, EXC_HV)
 
 #define __MASKABLE_RELON_EXCEPTION_PSERIES(vec, label, h, extra)       \
@@ -565,7 +565,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
                                          EXC_HV, SOFTEN_TEST_HV)
 
 #define MASKABLE_RELON_EXCEPTION_HV_OOL(vec, label)                    \
-       EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec);            \
+       __EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec);          \
        EXCEPTION_RELON_PROLOG_PSERIES_1(label, EXC_HV)
 
 /*