diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-15 21:22:39 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-22 15:10:56 +0100 |
| commit | 30b8b0066cafef274fc92462578ee346211ce7cb (patch) | |
| tree | 62d479f3d0c710ba2500522b86a295f579d86a55 /init/main.c | |
| parent | e714a91f92ca59f7e71e7332b8ec2aa2944f629e (diff) | |
| download | lwn-30b8b0066cafef274fc92462578ee346211ce7cb.tar.gz lwn-30b8b0066cafef274fc92462578ee346211ce7cb.zip | |
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/main.c')
| -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 @@ #include <asm/sections.h> #include <asm/cacheflush.h> -#ifdef CONFIG_X86_LOCAL_APIC -#include <asm/smp.h> -#endif - static int kernel_init(void *); extern void init_IRQ(void); @@ -351,15 +347,6 @@ __setup("rdinit=", rdinit_setup); #ifndef CONFIG_SMP static const unsigned int setup_max_cpus = NR_CPUS; -#ifdef CONFIG_X86_LOCAL_APIC -static void __init smp_init(void) -{ - APIC_init_uniprocessor(); -} -#else -#define smp_init() do { } while (0) -#endif - static inline void setup_nr_cpu_ids(void) { } static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif |