Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38172
b: refs/heads/master
c: d86d9b8
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Sep 26, 2006
1 parent fd2625a commit a8046da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 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: 022d51b1b28d25d50935c39d7968fefe34102a9f
refs/heads/master: d86d9b8cab45adf64e2ea8fe975bec3282b5de81
7 changes: 1 addition & 6 deletions trunk/drivers/char/hvc_iseries.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,7 @@ static int put_chars(uint32_t vtermno, const char *buf, int count)
spin_lock_irqsave(&consolelock, flags);

if (viochar_is_console(pi) && !viopath_isactive(pi->lp)) {
spin_lock_irqsave(&consoleloglock, flags);
HvCall_writeLogBuffer(buf, count);
spin_unlock_irqrestore(&consoleloglock, flags);
sent = count;
goto done;
}
Expand All @@ -171,11 +169,8 @@ static int put_chars(uint32_t vtermno, const char *buf, int count)

len = (count > VIOCHAR_MAX_DATA) ? VIOCHAR_MAX_DATA : count;

if (viochar_is_console(pi)) {
spin_lock_irqsave(&consoleloglock, flags);
if (viochar_is_console(pi))
HvCall_writeLogBuffer(buf, len);
spin_unlock_irqrestore(&consoleloglock, flags);
}

init_data_event(viochar, pi->lp);

Expand Down

0 comments on commit a8046da

Please sign in to comment.