diff options
| author | Anna-Maria Gleixner <anna-maria@linutronix.de> | 2016-05-24 15:08:47 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-05-28 12:35:12 +0200 |
| commit | a8c5ddf08f1f7e587240c44f82f4762bd37df1f3 (patch) | |
| tree | 8a0cf71ca97ce2791dc8dec5d833441f38e820bf /arch/mips | |
| parent | bb93078e655be1e24d68f28f2756676e62c037ce (diff) | |
| download | linux-stable-a8c5ddf08f1f7e587240c44f82f4762bd37df1f3.tar.gz linux-stable-a8c5ddf08f1f7e587240c44f82f4762bd37df1f3.tar.bz2 linux-stable-a8c5ddf08f1f7e587240c44f82f4762bd37df1f3.zip | |
MIPS: Add missing FROZEN hotplug notifier transitions
The corresponding FROZEN hotplug notifier transitions used on
suspend/resume are ignored. Therefore the switch case action argument
is masked with the frozen hotplug notifier transition mask.
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: rt@linutronix.de
Patchwork: https://patchwork.linux-mips.org/patch/13351/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/cavium-octeon/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index dff88aa7e377..33aab89259f3 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c @@ -384,7 +384,7 @@ static int octeon_cpu_callback(struct notifier_block *nfb, { unsigned int cpu = (unsigned long)hcpu; - switch (action) { + switch (action & ~CPU_TASKS_FROZEN) { case CPU_UP_PREPARE: octeon_update_boot_vector(cpu); break; |