Messages in this thread Patch in this message | | | Date | Tue, 26 Sep 2006 11:54:16 +1000 | From | Stephen Rothwell <> | Subject | [POWERPC] fix spin lock nesting in hvc_iseries |
| |
We had nested spinlocks using the same flags variable, but it turns out that we don't need the nested locks at all (the lock protects a static buffer that we aren't using here), so just remove the extra locks.
Spotted by Alexey Dobriyan.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/char/hvc_iseries.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c index ea36201..f144a94 100644 --- a/drivers/char/hvc_iseries.c +++ b/drivers/char/hvc_iseries.c @@ -154,9 +154,7 @@ static int put_chars(uint32_t vtermno, c 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; } @@ -172,11 +170,8 @@ static int put_chars(uint32_t vtermno, c 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); -- 1.4.2.1 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |