Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99a3eb3845f034eb55640a3da73e5e28349678c6
Commit:     99a3eb3845f034eb55640a3da73e5e28349678c6
Parent:     d907dd2efd69195f4a5fc584a0eaecc599ca4c2c
Author:     Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 12 12:10:28 2006 +0100
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Dec 12 08:10:44 2006 -0800

    [PATCH] lockdep: fix seqlock_init()
    
    seqlock_init() needs to use spin_lock_init() for dynamic locks, so that
    lockdep is notified about the presence of a new lock.
    
    (this is a fallout of the recent networking merge, which started using
    the so-far unused seqlock_init() API.)
    
    This fix solves the following lockdep-internal warning on current -git:
    
     INFO: trying to register non-static key.
     the code is fine but needs lockdep annotation.
     turning off the locking correctness validator.
         __lock_acquire+0x10c/0x9f9
         lock_acquire+0x56/0x72
         _spin_lock+0x35/0x42
         neigh_destroy+0x9d/0x12e
         neigh_periodic_timer+0x10a/0x15c
         run_timer_softirq+0x126/0x18e
         __do_softirq+0x6b/0xe6
         do_softirq+0x64/0xd2
         ksoftirqd+0x82/0x138
    
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/linux/seqlock.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 4600093..6b0648c 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -44,8 +44,11 @@ typedef struct {
 #define SEQLOCK_UNLOCKED \
                 __SEQLOCK_UNLOCKED(old_style_seqlock_init)
 
-#define seqlock_init(x) \
-               do { *(x) = (seqlock_t) __SEQLOCK_UNLOCKED(x); } while (0)
+#define seqlock_init(x)                                        \
+       do {                                            \
+               (x)->sequence = 0;                      \
+               spin_lock_init(&(x)->lock);             \
+       } while (0)
 
 #define DEFINE_SEQLOCK(x) \
                seqlock_t x = __SEQLOCK_UNLOCKED(x)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to