powerpc/64s: Rename STD_EXCEPTION_PSERIES to STD_EXCEPTION

The "PSERIES" in STD_EXCEPTION_PSERIES is to differentiate the macros
from the legacy iSeries versions, which are called
STD_EXCEPTION_ISERIES. It is not anything to do with pseries vs
powernv or powermac etc.

We removed the legacy iSeries code in 2012, in commit 8ee3e0d69623x
("powerpc: Remove the main legacy iSerie platform code").

So remove "PSERIES" from the 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 138ea976f7307f178f8b3e363cbdbe83a4e903fb..3ff8473aa063438f4fe0329480845f7204331028 100644 (file)
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -553,7 +553,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 /*
  * Exception vectors.
  */
-#define STD_EXCEPTION_PSERIES(vec, label)                      \
+#define STD_EXCEPTION(vec, label)                              \
        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label,             \
                                 EXC_STD, KVMTEST_PR, vec);     \
 

diff --git a/arch/powerpc/include/asm/head-64.h b/arch/powerpc/include/asm/head-64.h
index 7e0e93f24cb79d8d62d16c72ed6365168a990425..66ea28dc21dd6a67654f4aad3a369a3f616fab73 100644 (file)
--- a/arch/powerpc/include/asm/head-64.h
+++ b/arch/powerpc/include/asm/head-64.h
@@ -260,7 +260,7 @@ name:
 
 #define EXC_REAL(name, start, size)                                    \
        EXC_REAL_BEGIN(name, start, size);                              \
-       STD_EXCEPTION_PSERIES(start, name##_common);                    \
+       STD_EXCEPTION(start, name##_common);                            \
        EXC_REAL_END(name, start, size);
 
 #define EXC_VIRT(name, start, size, realvec)                           \