diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-29 04:12:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-29 04:12:09 -0700 |
| commit | 55d0cef96447016f91f8c0fcabadfa2be88d1195 (patch) | |
| tree | 93c8b66daee39d0fb1877d3d857ec0bf90a8bd6b /include | |
| parent | 019c21a84e5a3e2bbe797dbb3e2886c0ce69e866 (diff) | |
| parent | 970c091b3aa90cecf670327f2053be294a99a33a (diff) | |
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.9
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/mmzone.h | 6 | ||||
| -rw-r--r-- | include/asm-ia64/page.h | 19 |
2 files changed, 9 insertions, 16 deletions
diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h index f28f0b28504f..89c392d2dab3 100644 --- a/include/asm-ia64/mmzone.h +++ b/include/asm-ia64/mmzone.h @@ -27,12 +27,6 @@ # define NR_NODE_MEMBLKS (NR_NODES * 4) #endif -extern unsigned long max_low_pfn; - -#define pfn_valid(pfn) (((pfn) < max_low_pfn) && ia64_pfn_valid(pfn)) -#define page_to_pfn(page) ((unsigned long) (page - vmem_map)) -#define pfn_to_page(pfn) (vmem_map + (pfn)) - #else /* CONFIG_DISCONTIGMEM */ # define NR_NODE_MEMBLKS 4 #endif /* CONFIG_DISCONTIGMEM */ diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 15e6eafc8028..29a30dbac2f1 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h @@ -84,17 +84,16 @@ extern int ia64_pfn_valid (unsigned long pfn); #endif #ifndef CONFIG_DISCONTIGMEM -# ifdef CONFIG_VIRTUAL_MEM_MAP +# 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)) +#else 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)) -# 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 -#endif /* CONFIG_DISCONTIGMEM */ +extern unsigned long max_low_pfn; +# define pfn_valid(pfn) (((pfn) < max_low_pfn) && ia64_pfn_valid(pfn)) +# define page_to_pfn(page) ((unsigned long) (page - vmem_map)) +# define pfn_to_page(pfn) (vmem_map + (pfn)) +#endif #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) |