---

yaml --- r: 5046 b: refs/heads/master c: 7c9a900 h: refs/heads/master v: v3
git-mirror · Jul 26, 2005 · a74691f · a74691f
1 parent 252d0f3
commit a74691f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a1421f81b64e49ce932125e7222a2d7b7f87f13
+refs/heads/master: 7c9a90073c75bffbb89763a0c7d44a2e44e9e628
diff --git a/trunk/arch/x86_64/kernel/reboot.c b/trunk/arch/x86_64/kernel/reboot.c
@@ -115,15 +115,8 @@ void machine_restart(char * __unused)
 
 	printk("machine restart\n");
 
-	machine_shutdown();
-
 	if (!reboot_force) {
-		local_irq_disable();
-#ifndef CONFIG_SMP
-		disable_local_APIC();
-#endif
-		disable_IO_APIC();
-		local_irq_enable();
+		machine_shutdown();
 	}
 
 	/* Tell the BIOS if we want cold or warm reboot */