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

Commit 3c460417 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: make non-MMU page_to_virt() return a void * 



The page_to_virt() macro for m68knommu is currently effectively returning
an int type. But the equivilent m68k macro returns a void * virtual address.
Modify the non-MMU macro to return a void * as well (using the __va macro).

This change will remove compiler warnings in common m68k code that use this
macro.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 5a4acf3e

arch/m68k/include/asm/page_no.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ extern unsigned long memory_end; 
#define pfn_to_virt(pfn)	__va((pfn) << PAGE_SHIFT)

#define pfn_to_virt(pfn)	__va((pfn) << PAGE_SHIFT)





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

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

#define page_to_virt(page)	((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)

#define page_to_virt(page)	__va(((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET))





#define pfn_to_page(pfn)	virt_to_page(pfn_to_virt(pfn))

#define pfn_to_page(pfn)	virt_to_page(pfn_to_virt(pfn))

#define page_to_pfn(page)	virt_to_pfn(page_to_virt(page))

#define page_to_pfn(page)	virt_to_pfn(page_to_virt(page))