aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_branch.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-12-02 15:34:05 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-03 02:56:19 -0500
commita5e25883a445dce94a087ca479b21a5959cd5c18 (patch)
tree9453b1116b9784b91d63fd6a1110af0d62fd02b7 /kernel/trace/trace_branch.c
parentdfdc5437bd62dd6a26961e27f26b671374749875 (diff)
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.c4
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)
42 if (unlikely(!tr)) 42 if (unlikely(!tr))
43 return; 43 return;
44 44
45 raw_local_irq_save(flags); 45 local_irq_save(flags);
46 cpu = raw_smp_processor_id(); 46 cpu = raw_smp_processor_id();
47 if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) 47 if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
48 goto out; 48 goto out;
@@ -74,7 +74,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
74 74
75 out: 75 out:
76 atomic_dec(&tr->data[cpu]->disabled); 76 atomic_dec(&tr->data[cpu]->disabled);
77 raw_local_irq_restore(flags); 77 local_irq_restore(flags);
78} 78}
79 79
80static inline 80static inline