X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fchar%2Fsysrq.c;h=feb25158c8ee99c6a00363da01b4ea69c63fe4eb;hb=b0c4e148bd591629749d02a8fbc8d81c26d548cf;hp=af79805b5576f4b08ca02b357cd4f3fb96d23ec6;hpb=2a322e4c08be4e7cb0c04b427ddaaa679fd88863;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index af79805b557..feb25158c8e 100644
--- 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 = {
@@ -228,7 +228,7 @@ static struct sysrq_key_op sysrq_term_op = {
 
 static void moom_callback(void *ignored)
 {
-	out_of_memory(GFP_KERNEL);
+	out_of_memory(GFP_KERNEL, 0);
 }
 
 static DECLARE_WORK(moom_work, moom_callback, NULL);