diff options
| author | Borislav Petkov <bp@suse.de> | 2017-09-26 19:08:45 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-09-27 09:37:41 +0200 |
| commit | 1e66e2b86293ff1ded32104ac0ad26a7f08ec439 (patch) | |
| tree | ef84d1ad9214e01f18a6dd08831ad1613c370dac | |
| parent | 9c71206d060d4e84896f3bd680319b29fe88b8e8 (diff) | |
| download | op-kernel-dev-1e66e2b86293ff1ded32104ac0ad26a7f08ec439.zip op-kernel-dev-1e66e2b86293ff1ded32104ac0ad26a7f08ec439.tar.gz | |
x86/apic: Use dead_cpu instead of current CPU when cleaning up
x2apic_dead_cpu() cleans up the leftovers of a CPU which got unplugged, but
instead of clearing the dead cpu bit in the cluster mask it clears the
current (alive) cpu bit. Noticed because smp_processor_id() is called in
preemptible code and triggers a debug warning.
[ tglx: Rewrote changelog ]
Fixes: 023a611748fd ("x86/apic/x2apic: Simplify cluster management")
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20170926170845.13955-1-bp@alien8.de
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_cluster.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c index 3da9427..6050c53 100644 --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c @@ -156,7 +156,7 @@ static int x2apic_dead_cpu(unsigned int dead_cpu) { struct cluster_mask *cmsk = per_cpu(cluster_masks, dead_cpu); - cpumask_clear_cpu(smp_processor_id(), &cmsk->mask); + cpumask_clear_cpu(dead_cpu, &cmsk->mask); free_cpumask_var(per_cpu(ipi_mask, dead_cpu)); return 0; } |
