Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4223
b: refs/heads/master
c: 8b67f8c
h: refs/heads/master
i:
  4221: 1bee64f
  4219: 386cc55
  4215: 19131c1
  4207: 8887e78
  4191: a665536
  4159: 9eb8632
  4095: 39ad1ee
v: v3
  • Loading branch information
Milton Miller authored and Linus Torvalds committed Jul 8, 2005
1 parent 15e2188 commit 15d672f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6f24808eeb54eed5994128a863cd25c40f36cfac
refs/heads/master: 8b67f8c177a642b35b7a05f530c12ef2834ef182
10 changes: 7 additions & 3 deletions trunk/drivers/char/hvc_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,17 @@ static void hvc_kick(void)
wake_up_process(hvc_task);
}

static int hvc_poll(struct hvc_struct *hp);

/*
* NOTE: This API isn't used if the console adapter doesn't support interrupts.
* In this case the console is poll driven.
*/
static irqreturn_t hvc_handle_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
{
hvc_kick();
/* if hvc_poll request a repoll, then kick the hvcd thread */
if (hvc_poll(dev_instance))
hvc_kick();
return IRQ_HANDLED;
}

Expand Down Expand Up @@ -598,8 +602,8 @@ static int hvc_poll(struct hvc_struct *hp)

/*
* Account for the total amount read in one loop, and if above
* 64 bytes, we do a quick schedule loop to let the tty grok the
* data and eventually throttle us.
* 64 bytes, we do a quick schedule loop to let the tty grok
* the data and eventually throttle us.
*/
read_total += n;
if (read_total >= 64) {
Expand Down

0 comments on commit 15d672f

Please sign in to comment.