diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 03:33:21 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 03:33:21 +0300 |
| commit | 480c93df5b99699390f93a7024c9f60d09da0e96 (patch) | |
| tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /lib | |
| parent | aecfcde920da8d32949f6cbbc1fc051b4ef9e7be (diff) | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
| download | linux-480c93df5b99699390f93a7024c9f60d09da0e96.tar.xz | |
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/idr.c | 2 | ||||
| -rw-r--r-- | lib/locking-selftest.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/idr.c b/lib/idr.c index c11c5765cdef..dab4bca86f5d 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -449,6 +449,7 @@ void idr_remove_all(struct idr *idp) n = idp->layers * IDR_BITS; p = idp->top; + rcu_assign_pointer(idp->top, NULL); max = 1 << n; id = 0; @@ -467,7 +468,6 @@ void idr_remove_all(struct idr *idp) p = *--paa; } } - rcu_assign_pointer(idp->top, NULL); idp->layers = 0; } EXPORT_SYMBOL(idr_remove_all); diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c index 280332c1827c..619313ed6c46 100644 --- a/lib/locking-selftest.c +++ b/lib/locking-selftest.c @@ -157,11 +157,11 @@ static void init_shared_classes(void) #define SOFTIRQ_ENTER() \ local_bh_disable(); \ local_irq_disable(); \ - trace_softirq_enter(); \ + lockdep_softirq_enter(); \ WARN_ON(!in_softirq()); #define SOFTIRQ_EXIT() \ - trace_softirq_exit(); \ + lockdep_softirq_exit(); \ local_irq_enable(); \ local_bh_enable(); |