--- v1
+++ v2
@@ -4,17 +4,16 @@
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
- arch/powerpc/kernel/setup_32.c | 6 ++++++
- arch/powerpc/kernel/setup_64.c | 6 ++++++
- 2 files changed, 12 insertions(+)
+ arch/powerpc/lib/feature-fixups.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
-diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
-index ecdc42d44951..8831738c3dcb 100644
---- a/arch/powerpc/kernel/setup_32.c
-+++ b/arch/powerpc/kernel/setup_32.c
-@@ -99,6 +99,12 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)
- PTRRELOC(&__stop___lwsync_fixup));
-
+diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
+index defb2998b818..8b0b0b51e8aa 100644
+--- a/arch/powerpc/lib/feature-fixups.c
++++ b/arch/powerpc/lib/feature-fixups.c
+@@ -177,6 +177,12 @@ void apply_feature_fixups(void)
+ &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
+ #endif
do_final_fixups();
+ /*
+ * init jump label so that cpu and mmu feature check can be optimized
@@ -22,25 +21,8 @@
+ * by now.
+ */
+ jump_label_init();
+ }
- return KERNELBASE + offset;
- }
-diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
-index 05dde6318b79..c6f6cbcbee91 100644
---- a/arch/powerpc/kernel/setup_64.c
-+++ b/arch/powerpc/kernel/setup_64.c
-@@ -480,6 +480,12 @@ void __init setup_system(void)
- do_lwsync_fixups(cur_cpu_spec->cpu_features,
- &__start___lwsync_fixup, &__stop___lwsync_fixup);
- do_final_fixups();
-+ /*
-+ * init jump label so that cpu and mmu feature check can be optimized
-+ * using jump label. We should have all the cpu/mmu features finalized
-+ * by now.
-+ */
-+ jump_label_init();
-
- /*
- * Unflatten the device-tree passed by prom_init or kexec
+ #ifdef CONFIG_FTR_FIXUP_SELFTEST
--
2.7.4