MIPS: SGI-IP27: move registering of smp ops into IP27 specific code

Calling register_smp_ops() in plat_mem_setup() is still early enough.
So by doing this we could remove the ugly #ifdef CONFIG_SGI_IP27 in
fw/arc/init.c.

Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Paul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org

diff --git a/arch/mips/fw/arc/init.c b/arch/mips/fw/arc/init.c
index 7b663455de6ba99976a47f82f64baa4c362087bb..4ac6466a88722a54bad29dfb7044cfebfcc19202 100644 (file)
--- a/arch/mips/fw/arc/init.c
+++ b/arch/mips/fw/arc/init.c
@@ -54,11 +54,4 @@ void __init prom_init(void)
        ArcRead(0, &c, 1, &cnt);
        ArcEnterInteractiveMode();
 #endif
-#ifdef CONFIG_SGI_IP27
-       {
-               extern const struct plat_smp_ops ip27_smp_ops;
-
-               register_smp_ops(&ip27_smp_ops);
-       }
-#endif
 }

diff --git a/arch/mips/sgi-ip27/ip27-common.h b/arch/mips/sgi-ip27/ip27-common.h
index e9e9f1dc8c20b2721f05aa7ec2b608cf2e600633..3ffbcf9bfd417b827557cd4fc402ec536f1d9ac7 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-common.h
+++ b/arch/mips/sgi-ip27/ip27-common.h
@@ -5,5 +5,6 @@
 
 extern void ip27_reboot_setup(void);
 extern void hub_rt_clock_event_init(void);
+extern const struct plat_smp_ops ip27_smp_ops;
 
 #endif /* __IP27_COMMON_H */

diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
index f48e2b3990f65acc2a24a51e201bbbe64f7e24ca..d160fb219d6d5bef2ec0848dae03101d968f2699 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@ -120,6 +120,8 @@ void __init plat_mem_setup(void)
        u64 p, e, n_mode;
        nasid_t nid;
 
+       register_smp_ops(&ip27_smp_ops);
+
        ip27_reboot_setup();
 
        /*