ARM: OMAP4+: Allow kexec on SMP variants

tmlind · tmlind · commit 3696203c4754 · 2016-06-22T22:57:02.000-07:00
Kexec needs omap4_cpu_kill, otherwise kexec will produce on SMP:

kexec_load failed: Invalid argument

Acked-by: Santosh Shilimkar &lt;ssantosh@kernel.org&gt;
Tested-by: Keerthy &lt;j-keerthy@ti.com&gt;
Signed-off-by: Tony Lindgren &lt;tony@atomide.com&gt;
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
@@ -272,6 +272,7 @@ extern void omap_auxcoreboot_addr(u32 cpu_addr);
 extern u32 omap_read_auxcoreboot0(void);
 
 extern void omap4_cpu_die(unsigned int cpu);
+extern int omap4_cpu_kill(unsigned int cpu);
 
 extern const struct smp_operations omap4_smp_ops;
 
diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c
@@ -64,3 +64,9 @@ void omap4_cpu_die(unsigned int cpu)
 		pr_debug("CPU%u: spurious wakeup call\n", cpu);
 	}
 }
+
+/* Needed by kexec and platform_can_cpu_hotplug() */
+int omap4_cpu_kill(unsigned int cpu)
+{
+	return 1;
+}

Original file line number	Diff line number	Diff line change
`@@ -64,3 +64,9 @@ void omap4_cpu_die(unsigned int cpu)`
`64`	`64`	`pr_debug("CPU%u: spurious wakeup call\n", cpu);`
`65`	`65`	`}`
`66`	`66`	`}`
	`67`	`+`
	`68`	`+/* Needed by kexec and platform_can_cpu_hotplug() */`
	`69`	`+int omap4_cpu_kill(unsigned int cpu)`
	`70`	`+{`
	`71`	`+ return 1;`
	`72`	`+}`