From patchwork Sun Sep 30 23:28:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: PPC: Correct the tophys/tovirt macros Date: Sun, 30 Sep 2012 13:28:47 -0000 From: Jason Gunthorpe X-Patchwork-Id: 188204 Message-Id: <20120930232847.GG30637@obsidianresearch.com> To: linuxppc-dev@lists.ozlabs.org asm/page.h discusses the calculation for v2p and p2v, it should be: va = pa + KERNELBASE - PHYSICAL_START which is the same as: va = pa + LOAD_OFFSET tophys/tovirt were using PAGE_OFFSET, which as page.h says, is almost always the same thing. Signed-off-by: Jason Gunthorpe --- arch/powerpc/include/asm/ppc_asm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index ea2a86e..44edc3a 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h @@ -461,14 +461,14 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) #define fromreal(rd) tovirt(rd,rd) #define tophys(rd,rs) \ -0: addis rd,rs,-PAGE_OFFSET@h; \ +0: addis rd,rs,-LOAD_OFFSET@h; \ .section ".vtop_fixup","aw"; \ .align 1; \ .long 0b; \ .previous #define tovirt(rd,rs) \ -0: addis rd,rs,PAGE_OFFSET@h; \ +0: addis rd,rs,LOAD_OFFSET@h; \ .section ".ptov_fixup","aw"; \ .align 1; \ .long 0b; \