Commit 612d8078 authored by Rongwei Zhang's avatar Rongwei Zhang Committed by Thomas Bogendoerfer

MIPS: fix duplicate definitions for exported symbols

Building with clang-14 fails with:

AS      arch/mips/kernel/relocate_kernel.o
<unknown>:0: error: symbol 'kexec_args' is already defined
<unknown>:0: error: symbol 'secondary_kexec_args' is already defined
<unknown>:0: error: symbol 'kexec_start_address' is already defined
<unknown>:0: error: symbol 'kexec_indirection_page' is already defined
<unknown>:0: error: symbol 'relocate_new_kernel_size' is already defined

It turns out EXPORT defined in asm/asm.h expands to a symbol definition,
so there is no need to define these symbols again. Remove duplicated
symbol definitions.

Fixes: 7aa1c8f4 ("MIPS: kdump: Add support")
Signed-off-by: default avatarRongwei Zhang <pudh4418@gmail.com>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 62776e43
...@@ -145,8 +145,7 @@ LEAF(kexec_smp_wait) ...@@ -145,8 +145,7 @@ LEAF(kexec_smp_wait)
* kexec_args[0..3] are used to prepare register values. * kexec_args[0..3] are used to prepare register values.
*/ */
kexec_args: EXPORT(kexec_args)
EXPORT(kexec_args)
arg0: PTR_WD 0x0 arg0: PTR_WD 0x0
arg1: PTR_WD 0x0 arg1: PTR_WD 0x0
arg2: PTR_WD 0x0 arg2: PTR_WD 0x0
...@@ -159,8 +158,7 @@ arg3: PTR_WD 0x0 ...@@ -159,8 +158,7 @@ arg3: PTR_WD 0x0
* their registers a0-a3. secondary_kexec_args[0..3] are used * their registers a0-a3. secondary_kexec_args[0..3] are used
* to prepare register values. * to prepare register values.
*/ */
secondary_kexec_args: EXPORT(secondary_kexec_args)
EXPORT(secondary_kexec_args)
s_arg0: PTR_WD 0x0 s_arg0: PTR_WD 0x0
s_arg1: PTR_WD 0x0 s_arg1: PTR_WD 0x0
s_arg2: PTR_WD 0x0 s_arg2: PTR_WD 0x0
...@@ -171,19 +169,16 @@ kexec_flag: ...@@ -171,19 +169,16 @@ kexec_flag:
#endif #endif
kexec_start_address: EXPORT(kexec_start_address)
EXPORT(kexec_start_address)
PTR_WD 0x0 PTR_WD 0x0
.size kexec_start_address, PTRSIZE .size kexec_start_address, PTRSIZE
kexec_indirection_page: EXPORT(kexec_indirection_page)
EXPORT(kexec_indirection_page)
PTR_WD 0 PTR_WD 0
.size kexec_indirection_page, PTRSIZE .size kexec_indirection_page, PTRSIZE
relocate_new_kernel_end: relocate_new_kernel_end:
relocate_new_kernel_size: EXPORT(relocate_new_kernel_size)
EXPORT(relocate_new_kernel_size)
PTR_WD relocate_new_kernel_end - relocate_new_kernel PTR_WD relocate_new_kernel_end - relocate_new_kernel
.size relocate_new_kernel_size, PTRSIZE .size relocate_new_kernel_size, PTRSIZE
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment