diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-03-19 11:47:39 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-03-19 13:40:08 +0100 |
| commit | f47ab81aca8264adae25005f0130db60c0af7797 (patch) | |
| tree | 24d3e5ef7e4f491efa9e9c4f8b05c133ee1dfafc /arch/x86/kernel/apic | |
| parent | a38f98735e168a20573c24dfffa96095b6fe1d23 (diff) | |
| download | linux-stable-f47ab81aca8264adae25005f0130db60c0af7797.tar.gz linux-stable-f47ab81aca8264adae25005f0130db60c0af7797.tar.bz2 linux-stable-f47ab81aca8264adae25005f0130db60c0af7797.zip | |
x86/apic/uv: Fix the hotplug notifier
The notifier is missing the CPU_DOWN_FAILED transition. That leaves the
heartbeat disabled when CPU_DOWN_PREPARE fails.
It also does not handle the FROZEN transition variants. That might not be an
issue for UV, but it's inconsistent.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Diffstat (limited to 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 278070381aee..8f4942e2bcbb 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -792,7 +792,8 @@ static int uv_scir_cpu_notify(struct notifier_block *self, unsigned long action, { long cpu = (long)hcpu; - switch (action) { + switch (action & ~CPU_TASKS_FROZEN) { + case CPU_DOWN_FAILED: case CPU_ONLINE: uv_heartbeat_enable(cpu); break; |