diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-15 16:22:39 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-22 09:10:56 -0500 |
commit | 30b8b0066cafef274fc92462578ee346211ce7cb (patch) | |
tree | 62d479f3d0c710ba2500522b86a295f579d86a55 /init | |
parent | e714a91f92ca59f7e71e7332b8ec2aa2944f629e (diff) |
init: Get rid of x86isms
The UP local API support can be set up from an early initcall. No need
for horrible hackery in the init code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/20150115211703.827943883@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/init/main.c b/init/main.c index 61b993767db5..179ada15d08a 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -87,10 +87,6 @@ | |||
87 | #include <asm/sections.h> | 87 | #include <asm/sections.h> |
88 | #include <asm/cacheflush.h> | 88 | #include <asm/cacheflush.h> |
89 | 89 | ||
90 | #ifdef CONFIG_X86_LOCAL_APIC | ||
91 | #include <asm/smp.h> | ||
92 | #endif | ||
93 | |||
94 | static int kernel_init(void *); | 90 | static int kernel_init(void *); |
95 | 91 | ||
96 | extern void init_IRQ(void); | 92 | extern void init_IRQ(void); |
@@ -351,15 +347,6 @@ __setup("rdinit=", rdinit_setup); | |||
351 | 347 | ||
352 | #ifndef CONFIG_SMP | 348 | #ifndef CONFIG_SMP |
353 | static const unsigned int setup_max_cpus = NR_CPUS; | 349 | static const unsigned int setup_max_cpus = NR_CPUS; |
354 | #ifdef CONFIG_X86_LOCAL_APIC | ||
355 | static void __init smp_init(void) | ||
356 | { | ||
357 | APIC_init_uniprocessor(); | ||
358 | } | ||
359 | #else | ||
360 | #define smp_init() do { } while (0) | ||
361 | #endif | ||
362 | |||
363 | static inline void setup_nr_cpu_ids(void) { } | 350 | static inline void setup_nr_cpu_ids(void) { } |
364 | static inline void smp_prepare_cpus(unsigned int maxcpus) { } | 351 | static inline void smp_prepare_cpus(unsigned int maxcpus) { } |
365 | #endif | 352 | #endif |