Commit da04c035 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] Fix spinlock owner debugging 



fix up the runqueue lock owner only if we truly did a context-switch
with the runqueue lock held. Impacts ia64, mips, sparc64 and arm.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 33333373

kernel/sched.c

+4 −4
Original line number Diff line number Diff line
@@ -294,6 +294,10 @@ static inline void prepare_lock_switch(runqueue_t *rq, task_t *next) 


static inline void finish_lock_switch(runqueue_t *rq, task_t *prev)

{

#ifdef CONFIG_DEBUG_SPINLOCK

	/* this is a valid case when another task releases the spinlock */

	rq->lock.owner = current;

#endif

	spin_unlock_irq(&rq->lock);

}
@@ -1529,10 +1533,6 @@ static inline void finish_task_switch(runqueue_t *rq, task_t *prev) 
	 *		Manfred Spraul <manfred@colorfullife.com>

	 */

	prev_task_flags = prev->flags;

#ifdef CONFIG_DEBUG_SPINLOCK

	/* this is a valid case when another task releases the spinlock */

	rq->lock.owner = current;

#endif

	finish_arch_switch(prev);

	finish_lock_switch(rq, prev);

	if (mm)