diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:33:21 -0400 |
| commit | 480c93df5b99699390f93a7024c9f60d09da0e96 (patch) | |
| tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /kernel/softirq.c | |
| parent | aecfcde920da8d32949f6cbbc1fc051b4ef9e7be (diff) | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
Merge branch 'core/locking' into tracing/ftrace
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 bbf6d6496f05..7571bcb71be4 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -191,7 +191,7 @@ asmlinkage void __do_softirq(void) | |||
| 191 | account_system_vtime(current); | 191 | account_system_vtime(current); |
| 192 | 192 | ||
| 193 | __local_bh_disable((unsigned long)__builtin_return_address(0)); | 193 | __local_bh_disable((unsigned long)__builtin_return_address(0)); |
| 194 | trace_softirq_enter(); | 194 | lockdep_softirq_enter(); |
| 195 | 195 | ||
| 196 | cpu = smp_processor_id(); | 196 | cpu = smp_processor_id(); |
| 197 | restart: | 197 | restart: |
| @@ -231,7 +231,7 @@ restart: | |||
| 231 | if (pending) | 231 | if (pending) |
| 232 | wakeup_softirqd(); | 232 | wakeup_softirqd(); |
| 233 | 233 | ||
| 234 | trace_softirq_exit(); | 234 | lockdep_softirq_exit(); |
| 235 | 235 | ||
| 236 | account_system_vtime(current); | 236 | account_system_vtime(current); |
| 237 | _local_bh_enable(); | 237 | _local_bh_enable(); |