From 7c68da54672bc2d4ad670387874d3e004acac7ba Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Mon, 28 Nov 2011 16:26:56 -0800 Subject: [PATCH] --- yaml --- r: 277243 b: refs/heads/master c: facc4e159672b4ed10aa18147bfa187b013c9505 h: refs/heads/master i: 277241: 9a57e5e2fdecf69ca14a144b9073944277d1796d 277239: fb91583c2582aa606dbd8f628d76c9196225cae8 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d302c3675acb..a7f594627abf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6fc6020140db437069d5bec447858fcfd64d31c +refs/heads/master: facc4e159672b4ed10aa18147bfa187b013c9505 diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index 860c02c7c959..c0ed3765ec39 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -350,12 +350,11 @@ static int rcu_implicit_offline_qs(struct rcu_data *rdp) */ static void rcu_idle_enter_common(struct rcu_dynticks *rdtp, long long oldval) { - trace_rcu_dyntick("Start", oldval, rdtp->dynticks_nesting); + trace_rcu_dyntick("Start", oldval, 0); if (!is_idle_task(current)) { struct task_struct *idle = idle_task(smp_processor_id()); - trace_rcu_dyntick("Error on entry: not idle task", - oldval, rdtp->dynticks_nesting); + trace_rcu_dyntick("Error on entry: not idle task", oldval, 0); ftrace_dump(DUMP_ALL); WARN_ONCE(1, "Current pid: %d comm: %s / Idle pid: %d comm: %s", current->pid, current->comm,