From a8046da7ad2fe1777fdd6052caa3fde2470df7d3 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 26 Sep 2006 11:54:16 +1000 Subject: [PATCH] --- yaml --- r: 38172 b: refs/heads/master c: d86d9b8cab45adf64e2ea8fe975bec3282b5de81 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/hvc_iseries.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 43483a95f23d..58c40a711675 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 022d51b1b28d25d50935c39d7968fefe34102a9f +refs/heads/master: d86d9b8cab45adf64e2ea8fe975bec3282b5de81 diff --git a/trunk/drivers/char/hvc_iseries.c b/trunk/drivers/char/hvc_iseries.c index 4747729459c7..8b6f197e5f8c 100644 --- a/trunk/drivers/char/hvc_iseries.c +++ b/trunk/drivers/char/hvc_iseries.c @@ -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; } @@ -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);