1 files changed, 13 insertions, 41 deletions
diff --git a/include/asm-powerpc/feature-fixups.h b/include/asm-powerpc/feature-fixups.h
index 85972125bbb8..35f927888fe8 100644
--- a/include/asm-powerpc/feature-fixups.h
+++ b/include/asm-powerpc/feature-fixups.h
@@ -19,55 +19,27 @@
 * that values will be negative, that is, the fixup table has to be
 * located after the code it fixes up.
 */
-#ifdef CONFIG_PPC64
+#if defined(CONFIG_PPC64) && !defined(__powerpc64__)
-#ifdef __powerpc64__
-/* 64 bits kernel, 64 bits code */
-#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)   \
-99:                                                     \
-        .section sect,"a";                              \
-        .align 3;                                       \
-98:                                                     \
-        .llong msk;                                     \
-        .llong val;                                     \
-        .llong label##b-98b;                            \
-        .llong 99b-98b;                                 \
-        .previous
-#else /* __powerpc64__ */
 /* 64 bits kernel, 32 bits code (ie. vdso32) */
+#define FTR_ENTRY_LONG          .llong
+#define FTR_ENTRY_OFFSET        .long 0xffffffff; .long
+#else
+/* 64 bit kernel 64 bit code, or 32 bit kernel 32 bit code */
+#define FTR_ENTRY_LONG          PPC_LONG
+#define FTR_ENTRY_OFFSET        PPC_LONG
+#endif
 #define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)   \
 99:                                                     \
        .section sect,"a";                              \
        .align 3;                                       \
 98:                                                     \
-        .llong msk;                                     \
+        FTR_ENTRY_LONG msk;                             \
-        .llong val;                                     \
+        FTR_ENTRY_LONG val;                             \
-        .long 0xffffffff;                               \
+        FTR_ENTRY_OFFSET label##b-98b;                  \
-        .long label##b-98b;                             \
+        FTR_ENTRY_OFFSET 99b-98b;                       \
-        .long 0xffffffff;                               \
-        .long 99b-98b;                                  \
-        .previous
-#endif /* !__powerpc64__ */
-#else /* CONFIG_PPC64 */
-/* 32 bits kernel, 32 bits code */
-#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)   \
-99:                                                     \
-        .section sect,"a";                              \
-        .align 2;                                       \
-98:                                                     \
-        .long msk;                                      \
-        .long val;                                      \
-        .long label##b-98b;                             \
-        .long 99b-98b;                                  \
        .previous
-#endif /* !CONFIG_PPC64 */
 /* CPU feature dependent sections */

diff --git a/include/asm-powerpc/feature-fixups.h b/include/asm-powerpc/feature-fixups.h index 85972125bbb8..35f927888fe8 100644 --- a/include/asm-powerpc/feature-fixups.h +++ b/include/asm-powerpc/feature-fixups.h
@@ -19,55 +19,27 @@
19	* that values will be negative, that is, the fixup table has to be	19	* that values will be negative, that is, the fixup table has to be
20	* located after the code it fixes up.	20	* located after the code it fixes up.
21	*/	21	*/
22	#ifdef CONFIG_PPC64	22	#if defined(CONFIG_PPC64) && !defined(__powerpc64__)
23
24	#ifdef __powerpc64__
25
26	/* 64 bits kernel, 64 bits code */
27	#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect) \
28	99: \
29	.section sect,"a"; \
30	.align 3; \
31	98: \
32	.llong msk; \
33	.llong val; \
34	.llong label##b-98b; \
35	.llong 99b-98b; \
36	.previous
37
38	#else /* __powerpc64__ */
39
40	/* 64 bits kernel, 32 bits code (ie. vdso32) */	23	/* 64 bits kernel, 32 bits code (ie. vdso32) */
		24	#define FTR_ENTRY_LONG .llong
		25	#define FTR_ENTRY_OFFSET .long 0xffffffff; .long
		26	#else
		27	/* 64 bit kernel 64 bit code, or 32 bit kernel 32 bit code */
		28	#define FTR_ENTRY_LONG PPC_LONG
		29	#define FTR_ENTRY_OFFSET PPC_LONG
		30	#endif
		31
41	#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect) \	32	#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect) \
42	99: \	33	99: \
43	.section sect,"a"; \	34	.section sect,"a"; \
44	.align 3; \	35	.align 3; \
45	98: \	36	98: \
46	.llong msk; \	37	FTR_ENTRY_LONG msk; \
47	.llong val; \	38	FTR_ENTRY_LONG val; \
48	.long 0xffffffff; \	39	FTR_ENTRY_OFFSET label##b-98b; \
49	.long label##b-98b; \	40	FTR_ENTRY_OFFSET 99b-98b; \
50	.long 0xffffffff; \
51	.long 99b-98b; \
52	.previous
53
54	#endif /* !__powerpc64__ */
55
56	#else /* CONFIG_PPC64 */
57
58	/* 32 bits kernel, 32 bits code */
59	#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect) \
60	99: \
61	.section sect,"a"; \
62	.align 2; \
63	98: \
64	.long msk; \
65	.long val; \
66	.long label##b-98b; \
67	.long 99b-98b; \
68	.previous	41	.previous
69		42
70	#endif /* !CONFIG_PPC64 */
71		43
72		44
73	/* CPU feature dependent sections */	45	/* CPU feature dependent sections */