Fix setup_per_pcu_areas() for UP compile

For !CONFIG_SMP we want the empty inline setup_per_cpu_areas().
If CONFIG_SMP is set, we never want the empty inline. If we use the
generic implementation, we have it here, if not the arch has it somwhere
else (hopefully).

diff --git a/init/main.c b/init/main.c
index e4f0d32230954532d096e5e485d27ba221950985..e96aca37a932746d73278f2c8101ad5766d48fb1 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -271,6 +271,10 @@ static void __init smp_init(void)
 #define smp_init()     do { } while (0)
 #endif
 
+static inline void setup_per_cpu_areas(void)
+{
+}
+
 #else
 
 #ifdef __GENERIC_PER_CPU
@@ -295,10 +299,6 @@ static void __init setup_per_cpu_areas(void)
                memcpy(ptr, __per_cpu_start, size);
        }
 }
-#else
-static inline void setup_per_cpu_areas(void)
-{
-}
 #endif /* !__GENERIC_PER_CPU */
 
 /* Called by boot processor to activate the rest. */