* hvc_iseries.c: overwriting spin_lock_irqsave()
@ 2006-09-25 12:47 Alexey Dobriyan
2006-09-25 14:58 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Alexey Dobriyan @ 2006-09-25 12:47 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-kernel
Stephen, -git4 contains the following code
drivers/char/hvc_iseries.c:
static int put_chars(uint32_t vtermno, const char *buf, int count)
{
unsigned long flags;
spin_lock_irqsave(&consolelock, flags);
if (viochar_is_console(pi) && !viopath_isactive(pi->lp)) {
spin_lock_irqsave(&consoleloglock, flags);
So, old flags are lost.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: hvc_iseries.c: overwriting spin_lock_irqsave() 2006-09-25 12:47 hvc_iseries.c: overwriting spin_lock_irqsave() Alexey Dobriyan @ 2006-09-25 14:58 ` Stephen Rothwell 2006-09-26 1:54 ` [POWERPC] fix spin lock nesting in hvc_iseries Stephen Rothwell 0 siblings, 1 reply; 3+ messages in thread From: Stephen Rothwell @ 2006-09-25 14:58 UTC (permalink / raw) To: Alexey Dobriyan; +Cc: linux-kernel Hi Alexy, On Mon, 25 Sep 2006 16:47:08 +0400 "Alexey Dobriyan" <adobriyan@gmail.com> wrote: > > Stephen, -git4 contains the following code > > drivers/char/hvc_iseries.c: > > static int put_chars(uint32_t vtermno, const char *buf, int count) > { > unsigned long flags; > > spin_lock_irqsave(&consolelock, flags); > if (viochar_is_console(pi) && !viopath_isactive(pi->lp)) { > spin_lock_irqsave(&consoleloglock, flags); > > So, old flags are lost. Ooops! Thanks for the heads up, I will send a fix patch tomorrow. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ ^ permalink raw reply [flat|nested] 3+ messages in thread
* [POWERPC] fix spin lock nesting in hvc_iseries 2006-09-25 14:58 ` Stephen Rothwell @ 2006-09-26 1:54 ` Stephen Rothwell 0 siblings, 0 replies; 3+ messages in thread From: Stephen Rothwell @ 2006-09-26 1:54 UTC (permalink / raw) To: paulus; +Cc: Alexey Dobriyan, linux-kernel, ppc-dev 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-09-26 1:54 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2006-09-25 12:47 hvc_iseries.c: overwriting spin_lock_irqsave() Alexey Dobriyan 2006-09-25 14:58 ` Stephen Rothwell 2006-09-26 1:54 ` [POWERPC] fix spin lock nesting in hvc_iseries Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®