projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge /spare/repo/linux-2.6/
[cascardo/linux.git]
/
drivers
/
char
/
sysrq.c
diff --git
a/drivers/char/sysrq.c
b/drivers/char/sysrq.c
index
12d563c
..
feb2515
100644
(file)
--- a/
drivers/char/sysrq.c
+++ b/
drivers/char/sysrq.c
@@
-115,7
+115,7
@@
static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
struct tty_struct *tty)
{
local_irq_enable();
-
machine_restart(NULL
);
+
emergency_restart(
);
}
static struct sysrq_key_op sysrq_reboot_op = {