浏览代码

Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Pull percpu update from Tejun Heo:
 "This contains just one minor cleanup patch which gets rid of an
  unnecessary irqsave/restore in the cpu dead callback"

* 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu_counter: percpu_counter_hotcpu_callback() cleanup
Linus Torvalds 8 年之前
父节点
当前提交
fb15a78210
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      lib/percpu_counter.c

+ 2 - 3
lib/percpu_counter.c

@@ -176,13 +176,12 @@ static int percpu_counter_cpu_dead(unsigned int cpu)
 	spin_lock_irq(&percpu_counters_lock);
 	spin_lock_irq(&percpu_counters_lock);
 	list_for_each_entry(fbc, &percpu_counters, list) {
 	list_for_each_entry(fbc, &percpu_counters, list) {
 		s32 *pcount;
 		s32 *pcount;
-		unsigned long flags;
 
 
-		raw_spin_lock_irqsave(&fbc->lock, flags);
+		raw_spin_lock(&fbc->lock);
 		pcount = per_cpu_ptr(fbc->counters, cpu);
 		pcount = per_cpu_ptr(fbc->counters, cpu);
 		fbc->count += *pcount;
 		fbc->count += *pcount;
 		*pcount = 0;
 		*pcount = 0;
-		raw_spin_unlock_irqrestore(&fbc->lock, flags);
+		raw_spin_unlock(&fbc->lock);
 	}
 	}
 	spin_unlock_irq(&percpu_counters_lock);
 	spin_unlock_irq(&percpu_counters_lock);
 #endif
 #endif