diff --git a/[refs] b/[refs] index ad743f69f4a7..8ddd267481a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 532774ec7fa396da20ca724c0cf83d93ee76622f +refs/heads/master: 368c1e3249afe0e59097e7df664435ae55fb9f8d diff --git a/trunk/drivers/char/hvc_console.c b/trunk/drivers/char/hvc_console.c index 74ecb5b2968e..fb57f67bb427 100644 --- a/trunk/drivers/char/hvc_console.c +++ b/trunk/drivers/char/hvc_console.c @@ -642,8 +642,11 @@ int hvc_poll(struct hvc_struct *hp) /* Handle the SysRq Hack */ /* XXX should support a sequence */ if (buf[i] == '\x0f') { /* ^O */ - sysrq_pressed = 1; - continue; + /* if ^O is pressed again, reset + * sysrq_pressed and flip ^O char */ + sysrq_pressed = !sysrq_pressed; + if (sysrq_pressed) + continue; } else if (sysrq_pressed) { handle_sysrq(buf[i], tty); sysrq_pressed = 0;