From e04479c8c0238b39475c4ad6fdb6183110605a83 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Tue, 6 Mar 2012 17:57:34 +0800 Subject: [PATCH] --- yaml --- r: 302763 b: refs/heads/master c: dc87917501e324701dbfb249def44054b5220187 h: refs/heads/master i: 302761: 9af053ed3c5ba6771bf2dc78ca568a23c6779220 302759: 9716383922156a85df6867b89743eced20219e7a v: v3 --- [refs] | 2 +- trunk/kernel/srcu.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d098463f041..43f6634b1299 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 966f58c2f6df826f385706673a9bb1edcfd3499a +refs/heads/master: dc87917501e324701dbfb249def44054b5220187 diff --git a/trunk/kernel/srcu.c b/trunk/kernel/srcu.c index e0139a274856..a43211c92863 100644 --- a/trunk/kernel/srcu.c +++ b/trunk/kernel/srcu.c @@ -193,7 +193,14 @@ static bool srcu_readers_active_idx_check(struct srcu_struct *sp, int idx) */ static int srcu_readers_active(struct srcu_struct *sp) { - return srcu_readers_active_idx(sp, 0) + srcu_readers_active_idx(sp, 1); + int cpu; + unsigned long sum = 0; + + for_each_possible_cpu(cpu) { + sum += ACCESS_ONCE(per_cpu_ptr(sp->per_cpu_ref, cpu)->c[0]); + sum += ACCESS_ONCE(per_cpu_ptr(sp->per_cpu_ref, cpu)->c[1]); + } + return sum; } /**