Re: rwsem-spinlock error

[Nuno Monteiro <nuno@itsari.org>]

On 2004.06.17 11:35, Nick Piggin wrote:
> Geert Uytterhoeven wrote:
>> On Wed, 16 Jun 2004, Marcelo Tosatti wrote:
>> 
>>> <nickpiggin:yahoo.com.au>:
>>>  o rwsem race fixes backported from 2.6
>> 
>> 
>>> Nuno Monteiro:
>>>  o Fix rwsem-fix typo
>>>  o Complete rwsem typo fix
>> 
>> 
>> | rwsem-spinlock.c: In function `__rwsem_wake_one_writer':
>> | rwsem-spinlock.c:111: `tsk' undeclared (first use in this function)
>> | rwsem-spinlock.c:111: (Each undeclared identifier is reported only 
>> once
>> | rwsem-spinlock.c:111: for each function it appears in.)
>> 
>> How can this ever compile on any architecture?
>> 
> 
> Dangit. rwsem-spinlock.c isn't compiled for many architectures.
> 
> It should just require a
> 
> 	struct task_struct *tsk;
> 


Yeah, m68k being one of those that need it, hence why Geert noticed 
immediately. I only tested on x86, ppc32 and alpha, none of which
needs it. This should do the trick, then.



--- linux-2.4/lib/rwsem-spinlock.c~fix-rwsem-race-fix-3	2004-06-16 21:50:49.000000000 +0100
+++ linux-2.4/lib/rwsem-spinlock.c	2004-06-17 13:58:19.833211128 +0100
@@ -101,6 +101,7 @@ static inline struct rw_semaphore *__rws
 static inline struct rw_semaphore *__rwsem_wake_one_writer(struct rw_semaphore *sem)
 {
 	struct rwsem_waiter *waiter;
+	struct task_struct *tsk;
 
 	sem->activity = -1;