From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 5 Aug 2015 21:55:52 +0000 (+0200)
Subject: Merge branch 'linus' into x86/apic
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'linus' into x86/apic

Pull in upstream changes to avoid conflicts
---

b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8
diff --cc arch/x86/kernel/irq.c
index 7ed9cba27637,c7dfe1be784e..bc28496fd196
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@@ -347,9 -347,13 +347,14 @@@ int check_irq_vectors_for_cpu_disable(v
  			if (!desc)
  				continue;
  
+ 			/*
+ 			 * Protect against concurrent action removal,
+ 			 * affinity changes etc.
+ 			 */
+ 			raw_spin_lock(&desc->lock);
  			data = irq_desc_get_irq_data(desc);
 -			cpumask_copy(&affinity_new, data->affinity);
 +			cpumask_copy(&affinity_new,
 +				     irq_data_get_affinity_mask(data));
  			cpumask_clear_cpu(this_cpu, &affinity_new);
  
  			/* Do not count inactive or per-cpu irqs. */