diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-08 01:41:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-08 01:41:16 -0700 |
| commit | f5b7ee69739eec12c53293e49293edfe392f793b (patch) | |
| tree | b1a24f4a1bf2aa0264ddb137dea76408b2ad7a99 | |
| parent | d4576fcb868f2fbd43a1e9ed2164fbeca985ee01 (diff) | |
| parent | 74f46a076da5e5cd623fb6d92d5e55e3e03f1e66 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | include/asm-ia64/page.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 9352301938b8..15e6eafc8028 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h @@ -86,13 +86,14 @@ extern int ia64_pfn_valid (unsigned long pfn); #ifndef CONFIG_DISCONTIGMEM # ifdef CONFIG_VIRTUAL_MEM_MAP extern struct page *vmem_map; -# define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) -# define page_to_pfn(page) ((unsigned long) (page - vmem_map)) -# define pfn_to_page(pfn) (vmem_map + (pfn)) +# define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) +# define page_to_pfn(page) ((unsigned long) (page - vmem_map)) +# define pfn_to_page(pfn) (vmem_map + (pfn)) +# else +# define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) +# define page_to_pfn(page) ((unsigned long) (page - mem_map)) +# define pfn_to_page(pfn) (mem_map + (pfn)) # endif -#define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) -#define page_to_pfn(page) ((unsigned long) (page - mem_map)) -#define pfn_to_page(pfn) (mem_map + (pfn)) #endif /* CONFIG_DISCONTIGMEM */ #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |