lkml.org 
[lkml]   [2011]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2 v2] futex: Fix WARN_ON() test for UP
    From: Steven Rostedt <srostedt@redhat.com>

    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>
    Acked-by: Darren Hart <dvhart@linux.intel.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    kernel/futex.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/kernel/futex.c b/kernel/futex.c
    index 9fe9131..850d00b 100644
    --- a/kernel/futex.c
    +++ b/kernel/futex.c
    @@ -785,8 +785,8 @@ static void __unqueue_futex(struct futex_q *q)
    {
    struct futex_hash_bucket *hb;

    - if (WARN_ON(!q->lock_ptr || !spin_is_locked(q->lock_ptr)
    - || plist_node_empty(&q->list)))
    + if (WARN_ON_SMP(!q->lock_ptr || !spin_is_locked(q->lock_ptr))
    + || WARN_ON(plist_node_empty(&q->list)))
    return;

    hb = container_of(q->lock_ptr, struct futex_hash_bucket, lock);
    --
    1.7.2.3



    \
     
     \ /
      Last update: 2011-03-17 23:01    [W:0.038 / U:3.092 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site