powerpc/64s: Tidy up after exception handler rework

Somewhere along the line, search/replace left some naming garbled,
and untidy alignment (aka. mpe stuffed it up). Might as well fix them
all up now while git blame history doesn't extend too far.
Signed-off-by: NNicholas Piggin <npiggin@gmail.com>
Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>

arch/powerpc/include/asm/head-64.h

@@ -267,24 +267,24 @@ end_##sname:
 	__OOL_EXCEPTION(start, label, tramp_real_##name);		\
 	EXC_REAL_END(name, start, end);
 
-#define __TRAMP_REAL_REAL_OOL(name, vec)				\
+#define __TRAMP_REAL_OOL(name, vec)					\
 	TRAMP_REAL_BEGIN(tramp_real_##name);				\
 	STD_EXCEPTION_PSERIES_OOL(vec, name##_common);			\
 
 #define EXC_REAL_OOL(name, start, end)					\
 	__EXC_REAL_OOL(name, start, end);				\
-	__TRAMP_REAL_REAL_OOL(name, start);
+	__TRAMP_REAL_OOL(name, start);
 
 #define __EXC_REAL_OOL_MASKABLE(name, start, end)			\
 	__EXC_REAL_OOL(name, start, end);
 
-#define __TRAMP_REAL_REAL_OOL_MASKABLE(name, vec)			\
+#define __TRAMP_REAL_OOL_MASKABLE(name, vec)				\
 	TRAMP_REAL_BEGIN(tramp_real_##name);				\
 	MASKABLE_EXCEPTION_PSERIES_OOL(vec, name##_common);		\
 
 #define EXC_REAL_OOL_MASKABLE(name, start, end)				\
 	__EXC_REAL_OOL_MASKABLE(name, start, end);			\
-	__TRAMP_REAL_REAL_OOL_MASKABLE(name, start);
+	__TRAMP_REAL_OOL_MASKABLE(name, start);
 
 #define __EXC_REAL_OOL_HV_DIRECT(name, start, end, handler)		\
 	EXC_REAL_BEGIN(name, start, end);				\
@@ -294,70 +294,70 @@ end_##sname:
 #define __EXC_REAL_OOL_HV(name, start, end)				\
 	__EXC_REAL_OOL(name, start, end);
 
-#define __TRAMP_REAL_REAL_OOL_HV(name, vec)				\
+#define __TRAMP_REAL_OOL_HV(name, vec)					\
 	TRAMP_REAL_BEGIN(tramp_real_##name);				\
 	STD_EXCEPTION_HV_OOL(vec, name##_common);			\
 
 #define EXC_REAL_OOL_HV(name, start, end)				\
 	__EXC_REAL_OOL_HV(name, start, end);				\
-	__TRAMP_REAL_REAL_OOL_HV(name, start);
+	__TRAMP_REAL_OOL_HV(name, start);
 
 #define __EXC_REAL_OOL_MASKABLE_HV(name, start, end)			\
 	__EXC_REAL_OOL(name, start, end);
 
-#define __TRAMP_REAL_REAL_OOL_MASKABLE_HV(name, vec)			\
+#define __TRAMP_REAL_OOL_MASKABLE_HV(name, vec)				\
 	TRAMP_REAL_BEGIN(tramp_real_##name);				\
 	MASKABLE_EXCEPTION_HV_OOL(vec, name##_common);			\
 
 #define EXC_REAL_OOL_MASKABLE_HV(name, start, end)			\
 	__EXC_REAL_OOL_MASKABLE_HV(name, start, end);			\
-	__TRAMP_REAL_REAL_OOL_MASKABLE_HV(name, start);
+	__TRAMP_REAL_OOL_MASKABLE_HV(name, start);
 
 #define __EXC_VIRT_OOL(name, start, end)				\
 	EXC_VIRT_BEGIN(name, start, end);				\
 	__OOL_EXCEPTION(start, label, tramp_virt_##name);		\
 	EXC_VIRT_END(name, start, end);
 
-#define __TRAMP_REAL_VIRT_OOL(name, realvec)				\
+#define __TRAMP_VIRT_OOL(name, realvec)					\
 	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\
 	STD_RELON_EXCEPTION_PSERIES_OOL(realvec, name##_common);	\
 
 #define EXC_VIRT_OOL(name, start, end, realvec)				\
 	__EXC_VIRT_OOL(name, start, end);				\
-	__TRAMP_REAL_VIRT_OOL(name, realvec);
+	__TRAMP_VIRT_OOL(name, realvec);
 
 #define __EXC_VIRT_OOL_MASKABLE(name, start, end)			\
 	__EXC_VIRT_OOL(name, start, end);
 
-#define __TRAMP_REAL_VIRT_OOL_MASKABLE(name, realvec)		\
+#define __TRAMP_VIRT_OOL_MASKABLE(name, realvec)			\
 	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\
 	MASKABLE_RELON_EXCEPTION_PSERIES_OOL(realvec, name##_common);	\
 
 #define EXC_VIRT_OOL_MASKABLE(name, start, end, realvec)		\
 	__EXC_VIRT_OOL_MASKABLE(name, start, end);			\
-	__TRAMP_REAL_VIRT_OOL_MASKABLE(name, realvec);
+	__TRAMP_VIRT_OOL_MASKABLE(name, realvec);
 
 #define __EXC_VIRT_OOL_HV(name, start, end)				\
 	__EXC_VIRT_OOL(name, start, end);
 
-#define __TRAMP_REAL_VIRT_OOL_HV(name, realvec)			\
+#define __TRAMP_VIRT_OOL_HV(name, realvec)				\
 	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\
 	STD_RELON_EXCEPTION_HV_OOL(realvec, name##_common);		\
 
 #define EXC_VIRT_OOL_HV(name, start, end, realvec)			\
 	__EXC_VIRT_OOL_HV(name, start, end);				\
-	__TRAMP_REAL_VIRT_OOL_HV(name, realvec);
+	__TRAMP_VIRT_OOL_HV(name, realvec);
 
 #define __EXC_VIRT_OOL_MASKABLE_HV(name, start, end)			\
 	__EXC_VIRT_OOL(name, start, end);
 
-#define __TRAMP_REAL_VIRT_OOL_MASKABLE_HV(name, realvec)		\
+#define __TRAMP_VIRT_OOL_MASKABLE_HV(name, realvec)			\
 	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\
 	MASKABLE_RELON_EXCEPTION_HV_OOL(realvec, name##_common);	\
 
 #define EXC_VIRT_OOL_MASKABLE_HV(name, start, end, realvec)		\
 	__EXC_VIRT_OOL_MASKABLE_HV(name, start, end);			\
-	__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(name, realvec);
+	__TRAMP_VIRT_OOL_MASKABLE_HV(name, realvec);
 
 #define TRAMP_KVM(area, n)						\
 	TRAMP_KVM_BEGIN(do_kvm_##n);					\

arch/powerpc/kernel/exceptions-64s.S

@@ -960,7 +960,7 @@ EXC_COMMON(emulation_assist_common, 0xe40, emulation_assist_interrupt)
  * mode.
  */
 __EXC_REAL_OOL_HV_DIRECT(hmi_exception, 0xe60, 0xe80, hmi_exception_early)
-__TRAMP_REAL_REAL_OOL_MASKABLE_HV(hmi_exception, 0xe60)
+__TRAMP_REAL_OOL_MASKABLE_HV(hmi_exception, 0xe60)
 EXC_VIRT_NONE(0x4e60, 0x4e80)
 TRAMP_KVM_HV(PACA_EXGEN, 0xe60)
 TRAMP_REAL_BEGIN(hmi_exception_early)