diff options
| author | Łukasz Stelmach <l.stelmach@samsung.com> | 2020-04-22 21:45:04 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2020-04-24 11:38:25 +0200 |
| commit | 74c7c369f8c75c665605e117c14816bb060ed91c (patch) | |
| tree | d5eac32860daa62fea53f1207511ba52aa9dc6c6 /kexec/arch/arm/kexec-zImage-arm.c | |
| parent | 5dc72ded6050a5bb161e3b832867e660c9ca009e (diff) | |
arm: redefine OPT_APPEND and OPT_RAMDISK
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 <l.stelmach@samsung.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch/arm/kexec-zImage-arm.c')
| -rw-r--r-- | kexec/arch/arm/kexec-zImage-arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |