Merge tag 'irqchip-urgent-3.19' of git://git.infradead.org/users/jcooper/linux into...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvc_console.c

diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index 0ff7fda0742f4326113cf82f8a72cb355c840319..4fcec1d793a7f6ca0b2271c5b770dbd92554f623 100644 (file)
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -760,10 +760,17 @@ static int khvcd(void *unused)
                        if (poll_mask == 0)
                                schedule();
                        else {
+                               unsigned long j_timeout;
+
                                if (timeout < MAX_TIMEOUT)
                                        timeout += (timeout >> 6) + 1;
 
-                               msleep_interruptible(timeout);
+                               /*
+                                * We don't use msleep_interruptible otherwise
+                                * "kick" will fail to wake us up
+                                */
+                               j_timeout = msecs_to_jiffies(timeout) + 1;
+                               schedule_timeout_interruptible(j_timeout);
                        }
                }
                __set_current_state(TASK_RUNNING);