MIPS: Add missing FROZEN hotplug notifier transitions
authorAnna-Maria Gleixner <anna-maria@linutronix.de>
Tue, 24 May 2016 13:08:47 +0000 (15:08 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 28 May 2016 10:35:12 +0000 (12:35 +0200)
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>
arch/mips/cavium-octeon/smp.c

index dff88aa7e3778e9ec55d7edee2106fcaf84db7d2..33aab89259f3a5df6daa2c2f37ff7e1459bc827e 100644 (file)
@@ -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;