2.6.13-rc7-rt3 compile fix

2.6.13-rc7-rt3 compile fix

[K.R. Foley]

[-- Attachment #1: Type: text/plain, Size: 73 bytes --]

2.6.13-rc7-rt3 won't compile without the simple patch below.

-- 
    kr

[-- Attachment #2: rtspinfix.patch --]
[-- Type: text/x-patch, Size: 565 bytes --]

--- linux-2.6.13/kernel/rt.c.orig	2005-08-26 15:51:35.000000000 -0500
+++ linux-2.6.13/kernel/rt.c	2005-08-26 15:51:55.000000000 -0500
@@ -672,7 +672,7 @@
 	struct rt_mutex_waiter *w;
 	struct plist *curr1;
 
-	__raw_spin_lock(old_owner->task->pi_lock);
+	__raw_spin_lock(&old_owner->task->pi_lock);
 	TRACE_WARN_ON_LOCKED(plist_empty(&waiter->pi_list));
 	TRACE_WARN_ON_LOCKED(lock_owner(lock));
 
@@ -683,7 +683,7 @@
 	}
 	TRACE_WARN_ON_LOCKED(1);
 ok:
-	__raw_spin_unlock(old_owner->task->pi_lock);
+	__raw_spin_unlock(&old_owner->task->pi_lock);
 	return;
 }
 

Re: 2.6.13-rc7-rt3 compile fix

[Steven Rostedt]

On Fri, 2005-08-26 at 16:17 -0500, K.R. Foley wrote:
> 2.6.13-rc7-rt3 won't compile without the simple patch below.
>  
-       __raw_spin_lock(old_owner->task->pi_lock);
+       __raw_spin_lock(&old_owner->task->pi_lock);
        TRACE_WARN_ON_LOCKED(plist_empty(&waiter->pi_list));
        TRACE_WARN_ON_LOCKED(lock_owner(lock));
 
@@ -683,7 +683,7 @@
        }
        TRACE_WARN_ON_LOCKED(1);
 ok:
-       __raw_spin_unlock(old_owner->task->pi_lock);
+       __raw_spin_unlock(&old_owner->task->pi_lock);
        return;


Oops! my bad.  I saw that needed locking, but I didn't have the tracing
on (I was trying for internal deadlocks), so that part of the code
wasn't compiling.  If you turn off tracing it would compile :-)

Anyway, the next time I modify code that's protected by ifdefs, I'll
change my config and see at least the code compiles.

Thanks,

-- Steve

Re: 2.6.13-rc7-rt3 compile fix

[K.R. Foley]

Steven Rostedt wrote:
> On Fri, 2005-08-26 at 16:17 -0500, K.R. Foley wrote:
> 
>>2.6.13-rc7-rt3 won't compile without the simple patch below.
>> 
> 
> -       __raw_spin_lock(old_owner->task->pi_lock);
> +       __raw_spin_lock(&old_owner->task->pi_lock);
>         TRACE_WARN_ON_LOCKED(plist_empty(&waiter->pi_list));
>         TRACE_WARN_ON_LOCKED(lock_owner(lock));
>  
> @@ -683,7 +683,7 @@
>         }
>         TRACE_WARN_ON_LOCKED(1);
>  ok:
> -       __raw_spin_unlock(old_owner->task->pi_lock);
> +       __raw_spin_unlock(&old_owner->task->pi_lock);
>         return;
> 
> 
> Oops! my bad.  I saw that needed locking, but I didn't have the tracing
> on (I was trying for internal deadlocks), so that part of the code
> wasn't compiling.  If you turn off tracing it would compile :-)

Understood. ;-)

> 
> Anyway, the next time I modify code that's protected by ifdefs, I'll
> change my config and see at least the code compiles.
> 
> Thanks,
> 
> -- Steve
> 
> 
> 


-- 
   kr

Re: 2.6.13-rc7-rt3 compile fix

[Steven Rostedt]

On Fri, 2005-08-26 at 18:43 -0500, K.R. Foley wrote:
> Steven Rostedt wrote:
> > Oops! my bad.  I saw that needed locking, but I didn't have the tracing
> > on (I was trying for internal deadlocks), so that part of the code
> > wasn't compiling.  If you turn off tracing it would compile :-)
> 
> Understood. ;-)
> 

I'm wrong again :-) It wasn't the tracing.  Here's the ifdef

#if defined(ALL_TASKS_PI) && defined(CONFIG_RT_DEADLOCK_DETECT)

And Ingo turned on ALL_TASKS_PI now.  But I had
CONFIG_RT_DEADLOCK_DETECT also turned off.

-- Steve