diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-01-12 02:32:18 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-02-27 12:31:18 -0500 |
commit | f54bcdc2b81558a2b7e624cfeb4992422d9265f9 (patch) | |
tree | 20b420dd35e4b70fdd898c7c12c6007c4c0bc722 /arch/m68k/include/asm | |
parent | 5da3a65d2d1ba333d61999640ef241f150c69c6b (diff) |
m68k: Eliminate unused variable in page_to_phys()
"pgdat" is unused, so we can eliminate it and turn page_to_phys()
into a single-line macro.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm')
-rw-r--r-- | arch/m68k/include/asm/virtconvert.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/virtconvert.h b/arch/m68k/include/asm/virtconvert.h index 3f834b3ab5bd..f35229b8651d 100644 --- a/arch/m68k/include/asm/virtconvert.h +++ b/arch/m68k/include/asm/virtconvert.h | |||
@@ -31,12 +31,7 @@ static inline void *phys_to_virt(unsigned long address) | |||
31 | #define page_to_phys(page) \ | 31 | #define page_to_phys(page) \ |
32 | __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT)) | 32 | __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT)) |
33 | #else | 33 | #else |
34 | #define page_to_phys(_page) ({ \ | 34 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
35 | struct page *__page = _page; \ | ||
36 | struct pglist_data *pgdat; \ | ||
37 | pgdat = pg_data_table[page_to_nid(__page)]; \ | ||
38 | page_to_pfn(__page) << PAGE_SHIFT; \ | ||
39 | }) | ||
40 | #endif | 35 | #endif |
41 | #else | 36 | #else |
42 | #define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT) | 37 | #define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT) |