Add CCing Andrew Morton
On 12/12/2013 08:18 AM, Geoff Levand wrote:
> Simplify the code around one of the conditionals in the kexec_load
> syscall routine.
>
> The original code was confusing with a redundant check on KEXEC_ON_CRASH
> and comments outside of the conditional block. This change switches the
> order of the conditional check, and cleans up the comments for the
> conditional. There is no functional change to the code.
This looks good.
Reviewed-by: Zhang Yanfei <zhangyanfei at cn.fujitsu.com>
minor comments below.
>
> Signed-off-by: Geoff Levand <geoff at infradead.org> for Huawei, Linaro
> ---
> kernel/kexec.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/kernel/kexec.c b/kernel/kexec.c
> index 490afc0..89a6fa3 100644
> --- a/kernel/kexec.c
> +++ b/kernel/kexec.c
> @@ -980,19 +980,22 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
> if (nr_segments > 0) {
> unsigned long i;
>
> - /* Loading another kernel to reboot into */
> - if ((flags & KEXEC_ON_CRASH) == 0)
> - result = kimage_normal_alloc(&image, entry,
> - nr_segments, segments);
> - /* Loading another kernel to switch to if this one crashes */
> - else if (flags & KEXEC_ON_CRASH) {
> - /* Free any current crash dump kernel before
> + if (flags & KEXEC_ON_CRASH) {
> + /*
> + * Loading another kernel to switch to if this one
> + * crashes. Free any current crash dump kernel before
> * we corrupt it.
> */
> +
This empty line is not necessary, I think. But no big deal.
> kimage_free(xchg(&kexec_crash_image, NULL));
> result = kimage_crash_alloc(&image, entry,
> nr_segments, segments);
> crash_map_reserved_pages();
> + } else {
> + /* Loading another kernel to reboot into. */
> +
ditto.
> + result = kimage_normal_alloc(&image, entry,
> + nr_segments, segments);
> }
> if (result)
> goto out;
>
--
Thanks.
Zhang Yanfei
