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

Commit 8654164f authored by David S. Miller's avatar David S. Miller
Browse files

sparc32: Fix page_to_phys(). 



It doesn't account for phys_base like it should, fix by using
page_to_pfn().

While we're here, make virt_to_page() use pfn_to_page() as well, so we
consistently use the asm/memory-model.h abstractions instead of
open-coding memory model assumptions.

Tested-by: default avatarKristoffer Glembo <kristoffer@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af2e7cc2

arch/sparc/include/asm/io_32.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <asm/page.h>      /* IO address mapping routines need this */

#include <asm/system.h>



#define page_to_phys(page)	(((page) - mem_map) << PAGE_SHIFT)

#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)



static inline u32 flip_dword (u32 l)

{

arch/sparc/include/asm/page_32.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ extern unsigned long pfn_base; 
#define phys_to_virt		__va



#define ARCH_PFN_OFFSET		(pfn_base)

#define virt_to_page(kaddr)	(mem_map + ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT)))

#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)



#define pfn_valid(pfn)		(((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr))

#define virt_addr_valid(kaddr)	((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT) < max_mapnr)