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 <[email protected]> --- kexec/arch/arm/include/arch/options.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kexec/arch/arm/include/arch/options.h b/kexec/arch/arm/include/arch/options.h index abbf349..9272378 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: -- 2.25.0 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
