projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
kernel
/
reboot.c
diff --git
a/arch/arm/kernel/reboot.c
b/arch/arm/kernel/reboot.c
index
71a2ff9
..
3fa867a
100644
(file)
--- a/
arch/arm/kernel/reboot.c
+++ b/
arch/arm/kernel/reboot.c
@@
-104,8
+104,6
@@
void machine_halt(void)
{
local_irq_disable();
smp_send_stop();
-
- local_irq_disable();
while (1);
}
@@
-150,6
+148,5
@@
void machine_restart(char *cmd)
/* Whoops - the platform was unable to reboot. Tell the user! */
printk("Reboot failed -- System halted\n");
- local_irq_disable();
while (1);
}