1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 5b819b12675a..5a8a4c28c867 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -529,7 +529,7 @@ static void hvc_set_winsz(struct work_struct *work)
         tty = tty_kref_get(hp->tty);
         spin_unlock_irqrestore(&hp->lock, hvc_flags);
 
-        tty_do_resize(tty, tty, &ws);
+        tty_do_resize(tty, &ws);
         tty_kref_put(tty);
 }
 
@@ -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;
@@ -689,11 +692,10 @@ EXPORT_SYMBOL_GPL(hvc_poll);
  */
 void hvc_resize(struct hvc_struct *hp, struct winsize ws)
 {
-        if ((hp->ws.ws_row != ws.ws_row) || (hp->ws.ws_col != ws.ws_col)) {
-                hp->ws = ws;
-                schedule_work(&hp->tty_resize);
-        }
+        hp->ws = ws;
+        schedule_work(&hp->tty_resize);
 }
+EXPORT_SYMBOL_GPL(hvc_resize);
 
 /*
  * This kthread is either polling or interrupt driven.  This is determined by