From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Date: Thu, 27 Nov 2008 15:33:21 +0000 Subject: Re: [PATCH V2 2/3] Allow rwlocks to re-enable interrupts Message-Id: <1227800001.4454.1712.camel@twins> List-Id: References: <1224777451.11530.52.camel@elijah.suse.cz> <1224777969.11530.67.camel@elijah.suse.cz> In-Reply-To: <1224777969.11530.67.camel@elijah.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Petr Tesarik Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, tee@sgi.com, Robin Holt , Ingo Molnar On Thu, 2008-10-23 at 18:06 +0200, Petr Tesarik wrote: > Pass the original flags to rwlock arch-code, so that it can re-enable > interrupts if implemented for that architecture. > > Initially, make __raw_read_lock_flags and __raw_write_lock_flags > stubs which just do the same thing as non-flags variants. > > Signed-off-by: Petr Tesarik Acked-by: Peter Zijlstra > diff --git a/kernel/spinlock.c b/kernel/spinlock.c > index cf41b87..7c2f5b5 100644 > --- a/kernel/spinlock.c > +++ b/kernel/spinlock.c > @@ -121,7 +121,8 @@ unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock) > local_irq_save(flags); > preempt_disable(); > rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_); > - LOCK_CONTENDED(lock, _raw_read_trylock, _raw_read_lock); > + LOCK_CONTENDED_FLAGS(lock, _raw_read_trylock, _raw_read_lock, > + _raw_read_lock_flags, &flags); > return flags; > } > EXPORT_SYMBOL(_read_lock_irqsave); > @@ -151,7 +152,8 @@ unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock) > local_irq_save(flags); > preempt_disable(); > rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_); > - LOCK_CONTENDED(lock, _raw_write_trylock, _raw_write_lock); > + LOCK_CONTENDED_FLAGS(lock, _raw_write_trylock, _raw_write_lock, > + _raw_write_lock_flags, &flags); > return flags; > } > EXPORT_SYMBOL(_write_lock_irqsave); > >