MIPS: Add missing FROZEN hotplug notifier transitions

anna-marialx · ralfbaechle · commit a8c5ddf08f1f · 2016-05-28T12:35:12.000+02:00
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>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ static int octeon_cpu_callback(struct notifier_block *nfb,`
`384`	`384`	`{`
`385`	`385`	`unsigned int cpu = (unsigned long)hcpu;`
`386`	`386`
`387`		`- switch (action) {`
	`387`	`+ switch (action & ~CPU_TASKS_FROZEN) {`
`388`	`388`	`case CPU_UP_PREPARE:`
`389`	`389`	`octeon_update_boot_vector(cpu);`
`390`	`390`	`break;`