Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 2b6a56b2bf35..a5c6a9d7ff08 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -553,7 +553,6 @@ static int hvc_chars_in_buffer(struct tty_struct *tty)
 
 #define HVC_POLL_READ   0x00000001
 #define HVC_POLL_WRITE  0x00000002
-#define HVC_POLL_QUICK  0x00000004
 
 static int hvc_poll(struct hvc_struct *hp)
 {
@@ -568,6 +567,7 @@ static int hvc_poll(struct hvc_struct *hp)
         /* Push pending writes */
         if (hp->n_outbuf > 0)
                 hvc_push(hp);
+
         /* Reschedule us if still some write pending */
         if (hp->n_outbuf > 0)
                 poll_mask |= HVC_POLL_WRITE;
@@ -680,7 +680,7 @@ int khvcd(void *unused)
                         poll_mask |= HVC_POLL_READ;
                 if (hvc_kicked)
                         continue;
-                if (poll_mask & HVC_POLL_QUICK) {
+                if (poll_mask & HVC_POLL_WRITE) {
                         yield();
                         continue;
                 }