]> err.no Git - linux-2.6/commitdiff
[PATCH] 68328serial: sysrq should use emergency_reboot
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 26 Jul 2005 17:59:54 +0000 (11:59 -0600)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 21:35:44 +0000 (14:35 -0700)
The 68328serial.c driver has a weird local reimplementation of
magic sysrq.  The code is architecture specific enough that calling
machine_restart() is probably ok.  But there is no reason not to call
emergency_restart() so do so.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/serial/68328serial.c

index d27fb4c881d24104dc13215598ae8937cb04cc80..9097f2f7b12a6bb5a1dbfb88a79c6a40ed14051b 100644 (file)
@@ -316,7 +316,7 @@ static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *reg
 /*                             show_net_buffers(); */
                                return;
                        } else if (ch == 0x12) { /* ^R */
-                               machine_restart(NULL);
+                               emergency_restart();
                                return;
 #endif /* CONFIG_MAGIC_SYSRQ */
                        }