diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-06-22 02:05:12 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-06-22 22:57:02 -0700 |
| commit | 3696203c47544f126fe6f0edd6e88e5cc90e7f34 (patch) | |
| tree | fa4b94eb5fc33bec66be80224571f423b21697d2 | |
| parent | 3251885285e15e4b0ff1b0501a49380b24204f35 (diff) | |
| download | linux-3696203c47544f126fe6f0edd6e88e5cc90e7f34.tar.bz2 | |
ARM: OMAP4+: Allow kexec on SMP variants
Kexec needs omap4_cpu_kill, otherwise kexec will produce on SMP:
kexec_load failed: Invalid argument
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Tested-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap-hotplug.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 0136405a465f..deed42e1dd9c 100644 --- 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 index 593fec753b28..d3fb5661bb5d 100644 --- 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; +} |