From 8c5d261dab2fa4a17d006571439b8421a738a0e1 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 22 Oct 2012 15:29:59 +1000 Subject: [PATCH] --- yaml --- r: 344921 b: refs/heads/master c: 3c46041769adecf3ed964cbd1e6bd4324d063450 h: refs/heads/master i: 344919: 88a6fa26799ab1c2afa01f1026fe3faf4b7a5cfe v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/page_no.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b7d6e4fa35b0..76b4c0edaf07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a4acf3eac0631c288b8abb070fdb38c21eaf787 +refs/heads/master: 3c46041769adecf3ed964cbd1e6bd4324d063450 diff --git a/trunk/arch/m68k/include/asm/page_no.h b/trunk/arch/m68k/include/asm/page_no.h index 90595721185f..ef209169579a 100644 --- a/trunk/arch/m68k/include/asm/page_no.h +++ b/trunk/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))