diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2008-12-02 21:34:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 08:56:19 +0100 |
| commit | a5e25883a445dce94a087ca479b21a5959cd5c18 (patch) | |
| tree | 9453b1116b9784b91d63fd6a1110af0d62fd02b7 /kernel/trace/trace_branch.c | |
| parent | Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace (diff) | |
| download | linux-a5e25883a445dce94a087ca479b21a5959cd5c18.tar.xz linux-a5e25883a445dce94a087ca479b21a5959cd5c18.zip | |
ftrace: replace raw_local_irq_save with local_irq_save
Impact: fix for lockdep and ftrace
The raw_local_irq_save/restore confuses lockdep. This patch
converts them to the local_irq_save/restore variants.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_branch.c')
| -rw-r--r-- | kernel/trace/trace_branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index bc972753568d..6c00feb3bac7 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -42,7 +42,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) if (unlikely(!tr)) return; - raw_local_irq_save(flags); + local_irq_save(flags); cpu = raw_smp_processor_id(); if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) goto out; @@ -74,7 +74,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) out: atomic_dec(&tr->data[cpu]->disabled); - raw_local_irq_restore(flags); + local_irq_restore(flags); } static inline |