diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 17:29:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 17:29:53 -0700 |
| commit | 492f59f526d95e73028f57bff475b4bbe3c8cb72 (patch) | |
| tree | 8419a65de08183e350a468433fb3f4205e49ae80 /lib | |
| parent | f945b7abcb6cfd3106c9855aa2aa6e4396a19d76 (diff) | |
| parent | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (diff) | |
| download | kernel_samsung_smdk4412-492f59f526d95e73028f57bff475b4bbe3c8cb72.zip kernel_samsung_smdk4412-492f59f526d95e73028f57bff475b4bbe3c8cb72.tar.gz kernel_samsung_smdk4412-492f59f526d95e73028f57bff475b4bbe3c8cb72.tar.bz2 | |
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]
lockdep: remove duplicate CONFIG_DEBUG_LOCKDEP definitions
lockdep: require framepointers for x86
lockdep: remove extra "irq" string
lockdep: fix incorrect state name
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/locking-selftest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c index 280332c..619313e 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(); |