lkml.org 
[lkml]   [2008]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [RFC][PATCH 7/7] lockdep: spin_lock_nest_lock()
    From
    Date
    Please fold (or tell me to provide a new patch)


    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    ---
    diff -u linux-2.6/include/linux/spinlock.h linux-2.6/include/linux/spinlock.h
    --- linux-2.6/include/linux/spinlock.h
    +++ linux-2.6/include/linux/spinlock.h
    @@ -185,8 +185,8 @@
    # define spin_lock_nested(lock, subclass) _spin_lock_nested(lock, subclass)
    # define spin_lock_nest_lock(lock, nest_lock) \
    do { \
    - typecheck(struct lockdep_map *, &nest_lock->dep_map); \
    - _spin_lock_nest_lock(lock, &nest_lock->dep_map); \
    + typecheck(struct lockdep_map *, &(nest_lock)->dep_map);\
    + _spin_lock_nest_lock(lock, &(nest_lock)->dep_map); \
    } while (0)
    #else
    # define spin_lock_nested(lock, subclass) _spin_lock(lock)
    diff -u linux-2.6/kernel/spinlock.c linux-2.6/kernel/spinlock.c
    --- linux-2.6/kernel/spinlock.c
    +++ linux-2.6/kernel/spinlock.c
    @@ -323,7 +323,7 @@
    LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
    }

    -EXPORT_SYMBOL(_spin_lock_nest_lock)
    +EXPORT_SYMBOL(_spin_lock_nest_lock);

    #endif

    --- linux-2.6.orig/include/linux/spinlock_api_smp.h
    +++ linux-2.6/include/linux/spinlock_api_smp.h
    @@ -22,6 +22,8 @@ int in_lock_functions(unsigned long addr
    void __lockfunc _spin_lock(spinlock_t *lock) __acquires(lock);
    void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass)
    __acquires(lock);
    +void __lockfunc _spin_lock_nest_lock(spinlock_t *lock, struct lockdep_map *map)
    + __acquires(lock);
    void __lockfunc _read_lock(rwlock_t *lock) __acquires(lock);
    void __lockfunc _write_lock(rwlock_t *lock) __acquires(lock);
    void __lockfunc _spin_lock_bh(spinlock_t *lock) __acquires(lock);






    \
     
     \ /
      Last update: 2008-08-07 14:39    [W:4.128 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site