From 61e95dcbcbb58b3544b878c9ec97590ec9ea19d4 Mon Sep 17 00:00:00 2001 From: Li Zhong Date: Tue, 27 Nov 2012 13:58:27 +0800 Subject: [PATCH] --- yaml --- r: 349799 b: refs/heads/master c: 1bdc2b7d243dc8b9aadfc8002a69cf911e9e3e72 h: refs/heads/master i: 349797: fe9ed5c5080f20dde662f7d5fce7812cd9ce2d62 349795: 872ff7803f4523d604bcf78bc96c3c59d9b3c9c6 349791: c3890cf42923779df7297afc9482072e75dcddd9 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4da890830296..67354cead846 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62e3cb143fd78a2ee6f44ef0dfe50cdff2119d9a +refs/heads/master: 1bdc2b7d243dc8b9aadfc8002a69cf911e9e3e72 diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index cceda7602dfd..d145796bd61f 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -336,7 +336,7 @@ static struct rcu_node *rcu_get_root(struct rcu_state *rsp) static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval, bool user) { - trace_rcu_dyntick("Start", oldval, 0); + trace_rcu_dyntick("Start", oldval, rdtp->dynticks_nesting); if (!user && !is_idle_task(current)) { struct task_struct *idle = idle_task(smp_processor_id());