summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-10-22 15:29:59 +1000
committerGreg Ungerer <gerg@uclinux.org>2012-12-05 10:51:22 +1000
commit3c46041769adecf3ed964cbd1e6bd4324d063450 (patch)
tree931aed6304d6e738a7b10293aa120cccafe5d572 /arch/m68k
parent5a4acf3eac0631c288b8abb070fdb38c21eaf787 (diff)
downloadop-kernel-dev-3c46041769adecf3ed964cbd1e6bd4324d063450.zip
op-kernel-dev-3c46041769adecf3ed964cbd1e6bd4324d063450.tar.gz
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: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/page_no.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h
index 9059572..ef20916 100644
--- a/arch/m68k/include/asm/page_no.h
+++ b/arch/m68k/include/asm/page_no.h
@@ -26,7 +26,7 @@ extern unsigned long memory_end;
#define pfn_to_virt(pfn) __va((pfn) << 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 page_to_pfn(page) virt_to_pfn(page_to_virt(page))
OpenPOWER on IntegriCloud