diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:30:40 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:32:36 -0400 |
commit | d820ac4c2fa881079e6b689d2098adce337558ae (patch) | |
tree | 39e4e989d22271cd401f6974c9ae7accc571d500 /kernel/softirq.c | |
parent | 3c1f67d60e2b4f4455563928999fd41cc653645d (diff) |
locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]
Impact: cleanup
The naming clashes with upcoming softirq tracepoints, so rename the
APIs to lockdep_*().
Requested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 9041ea7948fe..08a030f85416 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -180,7 +180,7 @@ asmlinkage void __do_softirq(void) | |||
180 | account_system_vtime(current); | 180 | account_system_vtime(current); |
181 | 181 | ||
182 | __local_bh_disable((unsigned long)__builtin_return_address(0)); | 182 | __local_bh_disable((unsigned long)__builtin_return_address(0)); |
183 | trace_softirq_enter(); | 183 | lockdep_softirq_enter(); |
184 | 184 | ||
185 | cpu = smp_processor_id(); | 185 | cpu = smp_processor_id(); |
186 | restart: | 186 | restart: |
@@ -220,7 +220,7 @@ restart: | |||
220 | if (pending) | 220 | if (pending) |
221 | wakeup_softirqd(); | 221 | wakeup_softirqd(); |
222 | 222 | ||
223 | trace_softirq_exit(); | 223 | lockdep_softirq_exit(); |
224 | 224 | ||
225 | account_system_vtime(current); | 225 | account_system_vtime(current); |
226 | _local_bh_enable(); | 226 | _local_bh_enable(); |