---

yaml --- r: 182211 b: refs/heads/master c: f54bcdc h: refs/heads/master i: 182209: d7be022 182207: 410141c v: v3
git-mirror · Feb 27, 2010 · 76442c1 · 76442c1
1 parent ceb0f51
commit 76442c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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)