From fd188fabbe9d82dc34091d8ea0931efbb7da38b8 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Sun, 16 Nov 2008 05:59:52 +0100 Subject: [PATCH] --- yaml --- r: 121118 b: refs/heads/master c: 072b40a15616fe6bea68466e6bffcfcbf5c8f26f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_branch.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 977d5ad10ab0..f77767ba644c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c91add5fa68ea9b1f2923b3788c5dae0e60e1f6b +refs/heads/master: 072b40a15616fe6bea68466e6bffcfcbf5c8f26f diff --git a/trunk/kernel/trace/trace_branch.c b/trunk/kernel/trace/trace_branch.c index 85265553918f..2511e32572ca 100644 --- a/trunk/kernel/trace/trace_branch.c +++ b/trunk/kernel/trace/trace_branch.c @@ -41,7 +41,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) if (unlikely(!tr)) return; - local_irq_save(flags); + raw_local_irq_save(flags); cpu = raw_smp_processor_id(); if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) goto out; @@ -73,7 +73,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) out: atomic_dec(&tr->data[cpu]->disabled); - local_irq_restore(flags); + raw_local_irq_restore(flags); } static inline