diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 12:07:48 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 12:07:48 (GMT) |
commit | 1f3f424a6bee9de4d839be9951f4296333fac014 (patch) | |
tree | 95de90dfdb4a9f64fe470709b82176243537c952 /arch/x86/kernel/smpboot.c | |
parent | c8cae544bba6aee0f5cb0756dbab1a71d2c68737 (diff) | |
parent | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff) | |
download | linux-fsl-qoriq-1f3f424a6bee9de4d839be9951f4296333fac014.tar.xz |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 9d58134..199dcbb 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -289,9 +289,7 @@ static void __cpuinit start_secondary(void *unused) * fragile that we want to limit the things done here to the * most necessary things. */ -#ifdef CONFIG_VMI vmi_bringup(); -#endif cpu_init(); preempt_disable(); smp_callin(); |