Commit 0c329031 authored by Michael Ellerman's avatar Michael Ellerman

powerpc/64: Remove unused prom_init_toc symbols

Commit 24d33ac5 ("powerpc/64s: Make prom_init require RELOCATABLE")
made prom_init depend on CONFIG_RELOCATABLE.

But it missed cleaning up a case in the linker script for RELOCATABLE=n,
and associated symbols. Remove them now.

Fixes: 24d33ac5 ("powerpc/64s: Make prom_init require RELOCATABLE")
Reported-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220920131157.1032707-1-mpe@ellerman.id.au
parent 9a10ccb2
...@@ -32,9 +32,6 @@ extern long kvm_flush_link_stack; ...@@ -32,9 +32,6 @@ extern long kvm_flush_link_stack;
extern char __start_interrupts[]; extern char __start_interrupts[];
extern char __end_interrupts[]; extern char __end_interrupts[];
extern char __prom_init_toc_start[];
extern char __prom_init_toc_end[];
#ifdef CONFIG_PPC_POWERNV #ifdef CONFIG_PPC_POWERNV
extern char start_real_trampolines[]; extern char start_real_trampolines[];
extern char end_real_trampolines[]; extern char end_real_trampolines[];
......
...@@ -26,8 +26,7 @@ _end enter_prom $MEM_FUNCS reloc_offset __secondary_hold ...@@ -26,8 +26,7 @@ _end enter_prom $MEM_FUNCS reloc_offset __secondary_hold
__secondary_hold_acknowledge __secondary_hold_spinloop __start __secondary_hold_acknowledge __secondary_hold_spinloop __start
logo_linux_clut224 btext_prepare_BAT logo_linux_clut224 btext_prepare_BAT
reloc_got2 kernstart_addr memstart_addr linux_banner _stext reloc_got2 kernstart_addr memstart_addr linux_banner _stext
__prom_init_toc_start __prom_init_toc_end btext_setup_display TOC. btext_setup_display TOC. relocate"
relocate"
NM="$1" NM="$1"
OBJ="$2" OBJ="$2"
......
...@@ -337,11 +337,6 @@ SECTIONS ...@@ -337,11 +337,6 @@ SECTIONS
.got : AT(ADDR(.got) - LOAD_OFFSET) ALIGN(256) { .got : AT(ADDR(.got) - LOAD_OFFSET) ALIGN(256) {
*(.got) *(.got)
#ifndef CONFIG_RELOCATABLE
__prom_init_toc_start = .;
arch/powerpc/kernel/prom_init.o*(.toc)
__prom_init_toc_end = .;
#endif
*(.toc) *(.toc)
} }
#endif #endif
......
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