From 74c7c369f8c75c665605e117c14816bb060ed91c Mon Sep 17 00:00:00 2001 From: Łukasz Stelmach Date: Wed, 22 Apr 2020 21:45:04 +0200 Subject: arm: redefine OPT_APPEND and OPT_RAMDISK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Redefine OPT_APPEND to avoid clash with OPT_KEXEC_SYSCALL_AUTO. Redefine OPT_RAMDISK to avoid such problems in the future Minor cleanup in HPPA too. Signed-off-by: Łukasz Stelmach Signed-off-by: Simon Horman --- kexec/arch/arm/kexec-zImage-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kexec/arch/arm/kexec-zImage-arm.c') diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c index 9845925..ff609e2 100644 --- a/kexec/arch/arm/kexec-zImage-arm.c +++ b/kexec/arch/arm/kexec-zImage-arm.c @@ -409,7 +409,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 -- cgit