Merge branch 'linus' into cpus4096

2026-05-01 15:00:59 -07:00 · 2008-12-17 13:07:48 +01:00
parent c8cae544bb 1bda71282d
commit 1f3f424a6b
38 changed files with 332 additions and 227 deletions
@@ -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();