mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-06 04:14:13 +08:00
futex: Fix WARN_ON() test for UP
An update of the futex code had a WARN_ON(!spin_is_locked(q->lock_ptr)) But on UP, spin_is_locked() is always false, and will trigger this warning, and even worse, it will exit the function without doing the necessary work. Converting this to a WARN_ON_SMP() fixes the problem. Reported-by: Richard Weinberger <richard@nod.at> Tested-by: Richard Weinberger <richard@nod.at> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Darren Hart <dvhart@linux.intel.com> Cc: Lai Jiangshan <laijs@cn.fujitsu.com> LKML-Reference: <20110317192208.682654502@goodmis.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
2092e6be82
commit
2909620217
@ -782,8 +782,8 @@ static void __unqueue_futex(struct futex_q *q)
|
|||||||
{
|
{
|
||||||
struct futex_hash_bucket *hb;
|
struct futex_hash_bucket *hb;
|
||||||
|
|
||||||
if (WARN_ON(!q->lock_ptr || !spin_is_locked(q->lock_ptr)
|
if (WARN_ON_SMP(!q->lock_ptr || !spin_is_locked(q->lock_ptr))
|
||||||
|| plist_node_empty(&q->list)))
|
|| WARN_ON(plist_node_empty(&q->list)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
hb = container_of(q->lock_ptr, struct futex_hash_bucket, lock);
|
hb = container_of(q->lock_ptr, struct futex_hash_bucket, lock);
|
||||||
|
Loading…
Reference in New Issue
Block a user