Skip to content

Commit 612d807

Browse files
pudh4418tsbogend
authored andcommitted
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: 7aa1c8f ("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>
1 parent 62776e4 commit 612d807

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

arch/mips/kernel/relocate_kernel.S

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ LEAF(kexec_smp_wait)
145145
* kexec_args[0..3] are used to prepare register values.
146146
*/
147147

148-
kexec_args:
149-
EXPORT(kexec_args)
148+
EXPORT(kexec_args)
150149
arg0: PTR_WD 0x0
151150
arg1: PTR_WD 0x0
152151
arg2: PTR_WD 0x0
@@ -159,8 +158,7 @@ arg3: PTR_WD 0x0
159158
* their registers a0-a3. secondary_kexec_args[0..3] are used
160159
* to prepare register values.
161160
*/
162-
secondary_kexec_args:
163-
EXPORT(secondary_kexec_args)
161+
EXPORT(secondary_kexec_args)
164162
s_arg0: PTR_WD 0x0
165163
s_arg1: PTR_WD 0x0
166164
s_arg2: PTR_WD 0x0
@@ -171,19 +169,16 @@ kexec_flag:
171169

172170
#endif
173171

174-
kexec_start_address:
175-
EXPORT(kexec_start_address)
172+
EXPORT(kexec_start_address)
176173
PTR_WD 0x0
177174
.size kexec_start_address, PTRSIZE
178175

179-
kexec_indirection_page:
180-
EXPORT(kexec_indirection_page)
176+
EXPORT(kexec_indirection_page)
181177
PTR_WD 0
182178
.size kexec_indirection_page, PTRSIZE
183179

184180
relocate_new_kernel_end:
185181

186-
relocate_new_kernel_size:
187-
EXPORT(relocate_new_kernel_size)
182+
EXPORT(relocate_new_kernel_size)
188183
PTR_WD relocate_new_kernel_end - relocate_new_kernel
189184
.size relocate_new_kernel_size, PTRSIZE

0 commit comments

Comments
 (0)