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/hppa/kexec-elf-hppa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kexec/arch/hppa/kexec-elf-hppa.c') diff --git a/kexec/arch/hppa/kexec-elf-hppa.c b/kexec/arch/hppa/kexec-elf-hppa.c index d3ef0e9..474a919 100644 --- a/kexec/arch/hppa/kexec-elf-hppa.c +++ b/kexec/arch/hppa/kexec-elf-hppa.c @@ -76,7 +76,7 @@ int elf_hppa_load(int argc, char **argv, const char *buf, off_t len, { 0, 0, NULL, 0 }, }; - static const char short_options[] = KEXEC_ALL_OPT_STR "d"; + static const char short_options[] = KEXEC_ALL_OPT_STR; while ((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) { -- cgit