diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-04-14 10:29:44 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-04-14 10:29:44 -0500 |
| commit | b5a2d13febfa284f549c3cb6519c0d1d5aef19d6 (patch) | |
| tree | 9b87e63013ffd4979794cb0a075e2ec7e8a90107 | |
| parent | 22e962f9b7a7abbc2d17ceaf3917bb8e67b68a8f (diff) | |
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).
| -rw-r--r-- | init/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c index e4f0d3223095..e96aca37a932 100644 --- 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. */ |