diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-04 00:29:53 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-04 00:29:53 (GMT) |
commit | 492f59f526d95e73028f57bff475b4bbe3c8cb72 (patch) | |
tree | 8419a65de08183e350a468433fb3f4205e49ae80 /kernel/softirq.c | |
parent | f945b7abcb6cfd3106c9855aa2aa6e4396a19d76 (diff) | |
parent | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (diff) | |
download | linux-492f59f526d95e73028f57bff475b4bbe3c8cb72.tar.xz |
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 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 57d3f67..4877516 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -180,7 +180,7 @@ asmlinkage void __do_softirq(void) account_system_vtime(current); __local_bh_disable((unsigned long)__builtin_return_address(0)); - trace_softirq_enter(); + lockdep_softirq_enter(); cpu = smp_processor_id(); restart: @@ -220,7 +220,7 @@ restart: if (pending) wakeup_softirqd(); - trace_softirq_exit(); + lockdep_softirq_exit(); account_system_vtime(current); _local_bh_enable(); |