Merge branch 'for-4.12/asus' into for-linus

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index c8cebb137076..9c21000df0b5 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -176,13 +176,12 @@ static int percpu_counter_cpu_dead(unsigned int cpu)
         spin_lock_irq(&percpu_counters_lock);
         list_for_each_entry(fbc, &percpu_counters, list) {
                 s32 *pcount;
-                unsigned long flags;
 
-                raw_spin_lock_irqsave(&fbc->lock, flags);
+                raw_spin_lock(&fbc->lock);
                 pcount = per_cpu_ptr(fbc->counters, cpu);
                 fbc->count += *pcount;
                 *pcount = 0;
-                raw_spin_unlock_irqrestore(&fbc->lock, flags);
+                raw_spin_unlock(&fbc->lock);
         }
         spin_unlock_irq(&percpu_counters_lock);
 #endif