From b0b545d439ec6bc265bf4aa8a41f10e3cd2d27eb Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 14 Nov 2008 16:21:19 -0800 Subject: [PATCH] --- yaml --- r: 121119 b: refs/heads/master c: f3c7ac40a99f4044b843e6e2c4f46ab2d354c563 h: refs/heads/master i: 121117: be991d5e8cc8c103062932cfe1b2aadcccd33d9f 121115: 8b84ee26709c70e1ab2484a253e69f2ce280e7fe 121111: 6fe79928e4e811a9340c1d778a4dc51af1ca8e9b 121103: 215e76552255c05f198e23056c69528590410b14 121087: 0d6bdd5e98018ec494cbf84dbca1ca52a2828932 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ftrace.c | 2 +- trunk/kernel/trace/trace_branch.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f77767ba644c..5277d68141ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 072b40a15616fe6bea68466e6bffcfcbf5c8f26f +refs/heads/master: f3c7ac40a99f4044b843e6e2c4f46ab2d354c563 diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index 54cb9a7d15e5..3160254f6c7e 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -334,7 +334,7 @@ ftrace_record_ip(unsigned long ip) { struct dyn_ftrace *rec; - if (!ftrace_enabled || ftrace_disabled) + if (ftrace_disabled) return NULL; rec = ftrace_alloc_dyn_node(ip); diff --git a/trunk/kernel/trace/trace_branch.c b/trunk/kernel/trace/trace_branch.c index 2511e32572ca..85265553918f 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; - 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; @@ -73,7 +73,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