git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...
[pandora-kernel.git]
/
arch
/
tile
/
kernel
/
reboot.c
diff --git
a/arch/tile/kernel/reboot.c
b/arch/tile/kernel/reboot.c
index
acd86d2
..
baa3d90
100644
(file)
--- a/
arch/tile/kernel/reboot.c
+++ b/
arch/tile/kernel/reboot.c
@@
-27,7
+27,7
@@
void machine_halt(void)
{
warn_early_printk();
void machine_halt(void)
{
warn_early_printk();
-
raw
_local_irq_disable_all();
+
arch
_local_irq_disable_all();
smp_send_stop();
hv_halt();
}
smp_send_stop();
hv_halt();
}
@@
-35,14
+35,14
@@
void machine_halt(void)
void machine_power_off(void)
{
warn_early_printk();
void machine_power_off(void)
{
warn_early_printk();
-
raw
_local_irq_disable_all();
+
arch
_local_irq_disable_all();
smp_send_stop();
hv_power_off();
}
void machine_restart(char *cmd)
{
smp_send_stop();
hv_power_off();
}
void machine_restart(char *cmd)
{
-
raw
_local_irq_disable_all();
+
arch
_local_irq_disable_all();
smp_send_stop();
hv_restart((HV_VirtAddr) "vmlinux", (HV_VirtAddr) cmd);
}
smp_send_stop();
hv_restart((HV_VirtAddr) "vmlinux", (HV_VirtAddr) cmd);
}