Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c62ce9ef authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: remove remaining bits from CONFIG_APUS 



commit f21f49ea ("[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: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 32c8c4c6

arch/powerpc/include/asm/ppc_asm.h

+2 −17
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/vmlinux.lds.S

+0 −6
Original line number Diff line number Diff line
@@ -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) {