Simon Horman <horms at verge.net.au> writes: > From: Stephen Warren <swarren at nvidia.com> > > Prior to commit 3ab8352 "kexec jump", if machine_kexec() returned, > sys_reboot() would return -EINVAL. This patch restores this behaviour > for the non-KEXEC_JUMP case, where machine_kexec() is not expected to > return. > > This situation can occur on ARM, where kexec requires disabling all but > one CPU using CPU hotplug. However, if hotplug isn't supported by the > particular HW the kernel is running on, then kexec cannot succeed. Ugh. This reasoning is nonsense. Prior to the kexec jump work machine_kexec could never return and so could never return -EINVAL. It is not ok to have an image loaded that we can not kexec. kexec_load should fail not machine_shutdown or machine_kexec. The only time that machine_kexec can validly return is in the kexec_jump case, and that is a successful return. So formally. Nacked-by: "Eric W. Biederman" <ebiederm at xmission.com> My apologies for not speaking up sooner the broken ARM mutli-cpu shutdown architecture hurts my brain to think about ARM needs to get it's act together and stop modifying the generic code to deal with it's broken multi-cpu architecture. Eric > Signed-off-by: Stephen Warren <swarren at nvidia.com> > Acked-by: Will Deacon <will.deacon at arm.com> > Acked-by: Zhang Yanfei <zhangyanfei at cn.fujitsu.com> > Acked-by: Simon Horman <horms at verge.net.au> > --- > kernel/kexec.c | 2 ++ > 1 file changed, 2 insertions(+) > > Andrew, could you consider picking up this patch? > > diff --git a/kernel/kexec.c b/kernel/kexec.c > index 59f7b55..bde1190 100644 > --- a/kernel/kexec.c > +++ b/kernel/kexec.c > @@ -1702,6 +1702,8 @@ int kernel_kexec(void) > pm_restore_console(); > unlock_system_sleep(); > } > +#else > + error = -EINVAL; > #endif > > Unlock:
