diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 17:23:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 17:23:21 -0500 |
| commit | 92af254a1b7ea8c09ddff83887e5edc1342b37f8 (patch) | |
| tree | 1a390e67b4b047cb706bd26f6e9c52670153c3ac /include | |
| parent | f747307ed1defcdfd37a3ef84c48e3138691cd26 (diff) | |
| parent | 5a94bcfd2a18edcf368b3128c7df07b58e529932 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/page.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 9dd9da105278..5e6362a786b7 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h | |||
| @@ -110,8 +110,9 @@ extern int ia64_pfn_valid (unsigned long pfn); | |||
| 110 | # define pfn_to_page(pfn) (mem_map + (pfn)) | 110 | # define pfn_to_page(pfn) (mem_map + (pfn)) |
| 111 | #elif defined(CONFIG_DISCONTIGMEM) | 111 | #elif defined(CONFIG_DISCONTIGMEM) |
| 112 | extern struct page *vmem_map; | 112 | extern struct page *vmem_map; |
| 113 | extern unsigned long min_low_pfn; | ||
| 113 | extern unsigned long max_low_pfn; | 114 | extern unsigned long max_low_pfn; |
| 114 | # define pfn_valid(pfn) (((pfn) < max_low_pfn) && ia64_pfn_valid(pfn)) | 115 | # define pfn_valid(pfn) (((pfn) >= min_low_pfn) && ((pfn) < max_low_pfn) && ia64_pfn_valid(pfn)) |
| 115 | # define page_to_pfn(page) ((unsigned long) (page - vmem_map)) | 116 | # define page_to_pfn(page) ((unsigned long) (page - vmem_map)) |
| 116 | # define pfn_to_page(pfn) (vmem_map + (pfn)) | 117 | # define pfn_to_page(pfn) (vmem_map + (pfn)) |
| 117 | #endif | 118 | #endif |