diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 11:59:54 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 14:35:44 -0700 |
| commit | 804ebf46d51653e736108074473d9493398f2df9 (patch) | |
| tree | ffd9b45b9b60df92d6794885b1b786aca6592006 /drivers/serial | |
| parent | 970d32443e3d0be57a5cdc3de3752f528424b73d (diff) | |
| download | kernel_samsung_smdk4412-804ebf46d51653e736108074473d9493398f2df9.zip kernel_samsung_smdk4412-804ebf46d51653e736108074473d9493398f2df9.tar.gz kernel_samsung_smdk4412-804ebf46d51653e736108074473d9493398f2df9.tar.bz2 | |
[PATCH] 68328serial: sysrq should use emergency_reboot
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>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/68328serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index d27fb4c..9097f2f 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c @@ -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 */ } |