Merge remote-tracking branch 'linus/master' into testing

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index ba6085d9c741..93c5d5ecff4e 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);
         }
@@ -158,7 +158,7 @@ static void compute_batch_value(void)
         percpu_counter_batch = max(32, nr*2);
 }
 
-static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb,
+static int percpu_counter_hotcpu_callback(struct notifier_block *nb,
                                         unsigned long action, void *hcpu)
 {
 #ifdef CONFIG_HOTPLUG_CPU