From c5fec6d6368b4103557deb710150119dca438544 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 5 Aug 2020 10:46:39 -0700 Subject: [PATCH] kexec: Fix build with -fno-common Ensure that my_debug is not doubly defined Upstream-Status: Pending Signed-off-by: Khem Raj --- kexec/arch/ppc64/kexec-elf-ppc64.c | 2 -- kexec/fs2dt.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) --- a/kexec/arch/ppc64/kexec-elf-ppc64.c +++ b/kexec/arch/ppc64/kexec-elf-ppc64.c @@ -44,8 +44,6 @@ uint64_t initrd_base, initrd_size; unsigned char reuse_initrd = 0; const char *ramdisk; -/* Used for enabling printing message from purgatory code */ -int my_debug = 0; int elf_ppc64_probe(const char *buf, off_t len) { --- a/kexec/fs2dt.h +++ b/kexec/fs2dt.h @@ -30,7 +30,7 @@ extern struct bootblock bb[1]; /* Used for enabling printing message from purgatory code * Only has implemented for PPC64 */ -int my_debug; +extern int my_debug; extern int dt_no_old_root; void reserve(unsigned long long where, unsigned long long length); --- a/kexec/arch/arm64/kexec-arm64.h +++ b/kexec/arch/arm64/kexec-arm64.h @@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **a void zImage_arm64_usage(void); -off_t initrd_base; -off_t initrd_size; +extern off_t initrd_base; +extern off_t initrd_size; /** * struct arm64_mem - Memory layout info. @@ -65,7 +65,7 @@ struct arm64_mem { }; #define arm64_mem_ngv UINT64_MAX -struct arm64_mem arm64_mem; +extern struct arm64_mem arm64_mem; uint64_t get_phys_offset(void); uint64_t get_vp_offset(void); --- a/kexec/arch/x86_64/kexec-bzImage64.c +++ b/kexec/arch/x86_64/kexec-bzImage64.c @@ -42,7 +42,6 @@ #include static const int probe_debug = 0; -int bzImage_support_efi_boot; int bzImage64_probe(const char *buf, off_t len) { --- a/kexec/arch/ppc/kexec-elf-ppc.c +++ b/kexec/arch/ppc/kexec-elf-ppc.c @@ -33,7 +33,6 @@ static const int probe_debug = 0; unsigned char reuse_initrd; -const char *ramdisk; int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, char *);