Merge commit 'v2.6.28-rc6' into core/debug

[safe/jmp/linux-2.6] / lib / percpu_counter.c

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index 1191744..a866389 100644 (file)
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -62,7 +62,10 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc)
        for_each_online_cpu(cpu) {
                s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
                ret += *pcount;
+               *pcount = 0;
        }
+       fbc->count = ret;
+
        spin_unlock(&fbc->lock);
        return ret;
 }