powerpc: remove remaining bits from CONFIG_APUS

commit f21f49ea639a ("[POWERPC] Remove the dregs of APUS support from
arch/powerpc") removed CONFIG_APUS, but forgot to remove the logic
which adapts tophys() and tovirt() for it.

This patch removes the last stale pieces.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index b5d023680801b982cb5af2d82a21e943a7af57b9..378432995eb701430afdb4c203f59e92df16583a 100644 (file)
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -480,26 +480,11 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
        ori     rd,rd,((KERNELBASE>>48)&0xFFFF);\
        rotldi  rd,rd,48
 #else
-/*
- * On APUS (Amiga PowerPC cpu upgrade board), we don't know the
- * physical base address of RAM at compile time.
- */
 #define toreal(rd)     tophys(rd,rd)
 #define fromreal(rd)   tovirt(rd,rd)
 
-#define tophys(rd,rs)                          \
-0:     addis   rd,rs,-PAGE_OFFSET@h;           \
-       .section ".vtop_fixup","aw";            \
-       .align  1;                              \
-       .long   0b;                             \
-       .previous
-
-#define tovirt(rd,rs)                          \
-0:     addis   rd,rs,PAGE_OFFSET@h;            \
-       .section ".ptov_fixup","aw";            \
-       .align  1;                              \
-       .long   0b;                             \
-       .previous
+#define tophys(rd, rs) addis   rd, rs, -PAGE_OFFSET@h
+#define tovirt(rd, rs) addis   rd, rs, PAGE_OFFSET@h
 #endif
 
 #ifdef CONFIG_PPC_BOOK3S_64

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 1148c3c60c3b95cf1cc1719fe067426936e868a7..e1ce0aedcc9a5e0f9c94b5555da1c423f1206c08 100644 (file)
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -206,12 +206,6 @@ SECTIONS
 
        .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
                INIT_DATA
-               __vtop_table_begin = .;
-               KEEP(*(.vtop_fixup));
-               __vtop_table_end = .;
-               __ptov_table_begin = .;
-               KEEP(*(.ptov_fixup));
-               __ptov_table_end = .;
        }
 
        .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {