From: Simon Horman <horms@verge.net.au>
To: "Łukasz Stelmach" <l.stelmach@samsung.com>
Cc: kexec@lists.infradead.org
Subject: Re: [PATCH v2] arm: redefine OPT_APPEND and OPT_RAMDISK
Date: Thu, 16 Apr 2020 10:44:41 +0200 [thread overview]
Message-ID: <20200416084441.GA16024@vergenet.net> (raw)
In-Reply-To: <20200415105845.22067-1-l.stelmach@samsung.com>
On Wed, Apr 15, 2020 at 12:58:45PM +0200, Łukasz Stelmach wrote:
> Redefine OPT_APPEND to avoid clash with OPT_KEXEC_SYSCALL_AUTO.
> Redefine OPT_RAMDISK to avoid such problems in the future
>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Hi Łukasz,
I am slightly concerned that this will break things for users.
But OTOH perhaps we already broke things when adding OPT_KEXEC_SYSCALL_AUTO.
Do you have any thoughts on this?
> ---
> kexec/arch/arm/include/arch/options.h | 6 +++---
> kexec/arch/arm/kexec-zImage-arm.c | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kexec/arch/arm/include/arch/options.h b/kexec/arch/arm/include/arch/options.h
> index abbf349..6fabfb7 100644
> --- a/kexec/arch/arm/include/arch/options.h
> +++ b/kexec/arch/arm/include/arch/options.h
> @@ -4,12 +4,12 @@
> #define OPT_DT_NO_OLD_ROOT (OPT_MAX+0)
> #define OPT_ARCH_MAX (OPT_MAX+1)
>
> -#define OPT_APPEND 'a'
> -#define OPT_RAMDISK 'r'
> #define OPT_DTB (OPT_ARCH_MAX+0)
> #define OPT_ATAGS (OPT_ARCH_MAX+1)
> #define OPT_IMAGE_SIZE (OPT_ARCH_MAX+2)
> #define OPT_PAGE_OFFSET (OPT_ARCH_MAX+3)
> +#define OPT_APPEND (OPT_ARCH_MAX+4)
> +#define OPT_RAMDISK (OPT_ARCH_MAX+5)
>
> /* Options relevant to the architecture (excluding loader-specific ones),
> * in this case none:
> @@ -45,7 +45,7 @@
> { "image-size", 1, 0, OPT_IMAGE_SIZE }, \
> { "page-offset", 1, 0, OPT_PAGE_OFFSET },
>
> -#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR "a:r:s:"
> +#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR ""
>
> extern unsigned int kexec_arm_image_size;
>
> diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c
> index 2a7eea9..d1aa8f6 100644
> --- a/kexec/arch/arm/kexec-zImage-arm.c
> +++ b/kexec/arch/arm/kexec-zImage-arm.c
> @@ -418,7 +418,7 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
> { "page-offset", 1, 0, OPT_PAGE_OFFSET },
> { 0, 0, 0, 0 },
> };
> - static const char short_options[] = KEXEC_ARCH_OPT_STR "a:r:";
> + static const char short_options[] = KEXEC_ARCH_OPT_STR "";
>
> /*
> * Parse the command line arguments
> --
> 2.25.0
>
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2020-04-16 8:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200414085411eucas1p240d872905d55681ab4a3d9bb9f584563@eucas1p2.samsung.com>
2020-04-14 8:52 ` [PATCH] arm: redefine OPT_APPEND and OPT_RAMDISK Łukasz Stelmach
2020-04-15 10:58 ` [PATCH v2] " Łukasz Stelmach
2020-04-16 8:44 ` Simon Horman [this message]
2020-04-20 14:33 ` Lukasz Stelmach
2020-04-22 8:01 ` Simon Horman
2020-04-22 19:45 ` [PATCH v3] " Łukasz Stelmach
2020-04-24 9:40 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200416084441.GA16024@vergenet.net \
--to=horms@verge.net.au \
--cc=kexec@lists.infradead.org \
--cc=l.stelmach@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox