Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index ba6085d9c741..1fc23a3277e1 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -80,8 +80,8 @@ void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch)
         if (count >= batch || count <= -batch) {
                 raw_spin_lock(&fbc->lock);
                 fbc->count += count;
-                __this_cpu_write(*fbc->counters, 0);
                 raw_spin_unlock(&fbc->lock);
+                __this_cpu_write(*fbc->counters, 0);
         } else {
                 __this_cpu_write(*fbc->counters, count);
         }