Commit 612d8078 authored Nov 02, 2022 by Rongwei Zhang Committed by Thomas Bogendoerfer Nov 11, 2022

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: Rongwei Zhang <pudh4418@gmail.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

parent 62776e43

arch/mips/kernel/relocate_kernel.S

+5 −10

Original line number	Diff line number	Diff line
		@@ -145,7 +145,6 @@ LEAF(kexec_smp_wait)
		* kexec_args[0..3] are used to prepare register values.
		*/

		kexec_args:
		EXPORT(kexec_args)
		arg0: PTR_WD 0x0
		arg1: PTR_WD 0x0
		@@ -159,7 +158,6 @@ arg3: PTR_WD 0x0
		* their registers a0-a3. secondary_kexec_args[0..3] are used
		* to prepare register values.
		*/
		secondary_kexec_args:
		EXPORT(secondary_kexec_args)
		s_arg0: PTR_WD 0x0
		s_arg1: PTR_WD 0x0
		@@ -171,19 +169,16 @@ kexec_flag:

		#endif

		kexec_start_address:
		EXPORT(kexec_start_address)
		PTR_WD 0x0
		.size kexec_start_address, PTRSIZE

		kexec_indirection_page:
		EXPORT(kexec_indirection_page)
		PTR_WD 0
		.size kexec_indirection_page, PTRSIZE

		relocate_new_kernel_end:

		relocate_new_kernel_size:
		EXPORT(relocate_new_kernel_size)
		PTR_WD relocate_new_kernel_end - relocate_new_kernel
		.size relocate_new_kernel_size, PTRSIZE