projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://bughost.org/repos/ipw-delta/
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
reboot.c
diff --git
a/arch/x86_64/kernel/reboot.c
b/arch/x86_64/kernel/reboot.c
index
57e71db
..
47f9568
100644
(file)
--- a/
arch/x86_64/kernel/reboot.c
+++ b/
arch/x86_64/kernel/reboot.c
@@
-109,23
+109,10
@@
void machine_shutdown(void)
local_irq_enable();
}
local_irq_enable();
}
-void machine_
restart(char * __unuse
d)
+void machine_
emergency_restart(voi
d)
{
int i;
{
int i;
- 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();
- }
-
/* Tell the BIOS if we want cold or warm reboot */
*((unsigned short *)__va(0x472)) = reboot_mode;
/* Tell the BIOS if we want cold or warm reboot */
*((unsigned short *)__va(0x472)) = reboot_mode;
@@
-150,18
+137,26
@@
void machine_restart(char * __unused)
}
}
}
}
-EXPORT_SYMBOL(machine_restart);
+void machine_restart(char * __unused)
+{
+ printk("machine restart\n");
+
+ if (!reboot_force) {
+ machine_shutdown();
+ }
+ machine_emergency_restart();
+}
void machine_halt(void)
{
}
void machine_halt(void)
{
}
-EXPORT_SYMBOL(machine_halt);
-
void machine_power_off(void)
{
void machine_power_off(void)
{
+ if (!reboot_force) {
+ machine_shutdown();
+ }
if (pm_power_off)
pm_power_off();
}
if (pm_power_off)
pm_power_off();
}
-EXPORT_SYMBOL(machine_power_off);