From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 10 Mar 2015 02:13:45 +0000 (+1030)
Subject: x86: fix more deprecated cpu function usage.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fdaf3a6539d6b9b6a7240c3b00bd81c813b2760d;p=linux-beck.git

x86: fix more deprecated cpu function usage.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index d9d0bd2faaf4..ab3219b3fbda 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -171,8 +171,8 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
 		for_each_online_cpu(cpu) {
 			if (x2apic_cluster(this_cpu) != x2apic_cluster(cpu))
 				continue;
-			__cpu_clear(this_cpu, per_cpu(cpus_in_cluster, cpu));
-			__cpu_clear(cpu, per_cpu(cpus_in_cluster, this_cpu));
+			cpumask_clear_cpu(this_cpu, per_cpu(cpus_in_cluster, cpu));
+			cpumask_clear_cpu(cpu, per_cpu(cpus_in_cluster, this_cpu));
 		}
 		free_cpumask_var(per_cpu(cpus_in_cluster, this_cpu));
 		free_cpumask_var(per_cpu(ipi_mask, this_cpu));