diff --git a/[refs] b/[refs] index 134d85b38b08..48aa2d28f6ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 970d32443e3d0be57a5cdc3de3752f528424b73d +refs/heads/master: 804ebf46d51653e736108074473d9493398f2df9 diff --git a/trunk/drivers/serial/68328serial.c b/trunk/drivers/serial/68328serial.c index d27fb4c881d2..9097f2f7b12a 100644 --- a/trunk/drivers/serial/68328serial.c +++ b/trunk/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 */ }