From 76442c1ab09aed05a2b8a45fae807127ddd464c9 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 12 Jan 2010 08:32:18 +0100 Subject: [PATCH] --- yaml --- r: 182211 b: refs/heads/master c: f54bcdc2b81558a2b7e624cfeb4992422d9265f9 h: refs/heads/master i: 182209: d7be0225baa5a2cba73a3f5cbbc9757de253788f 182207: 410141c50ec5e442e01fe28a2d8e4cabd66fd338 v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/virtconvert.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 50ac8eb08495..ac199af6941c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5da3a65d2d1ba333d61999640ef241f150c69c6b +refs/heads/master: f54bcdc2b81558a2b7e624cfeb4992422d9265f9 diff --git a/trunk/arch/m68k/include/asm/virtconvert.h b/trunk/arch/m68k/include/asm/virtconvert.h index 3f834b3ab5bd..f35229b8651d 100644 --- a/trunk/arch/m68k/include/asm/virtconvert.h +++ b/trunk/arch/m68k/include/asm/virtconvert.h @@ -31,12 +31,7 @@ static inline void *phys_to_virt(unsigned long address) #define page_to_phys(page) \ __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT)) #else -#define page_to_phys(_page) ({ \ - struct page *__page = _page; \ - struct pglist_data *pgdat; \ - pgdat = pg_data_table[page_to_nid(__page)]; \ - page_to_pfn(__page) << PAGE_SHIFT; \ -}) +#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) #endif #else #define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT)