diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 14:23:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 14:23:21 -0800 |
| commit | 92af254a1b7ea8c09ddff83887e5edc1342b37f8 (patch) | |
| tree | 1a390e67b4b047cb706bd26f6e9c52670153c3ac /include | |
| parent | f747307ed1defcdfd37a3ef84c48e3138691cd26 (diff) | |
| parent | 5a94bcfd2a18edcf368b3128c7df07b58e529932 (diff) | |
| download | linux-3.10-92af254a1b7ea8c09ddff83887e5edc1342b37f8.tar.gz linux-3.10-92af254a1b7ea8c09ddff83887e5edc1342b37f8.tar.bz2 linux-3.10-92af254a1b7ea8c09ddff83887e5edc1342b37f8.zip | |
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 9dd9da10527..5e6362a786b 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); # define pfn_to_page(pfn) (mem_map + (pfn)) #elif defined(CONFIG_DISCONTIGMEM) extern struct page *vmem_map; +extern unsigned long min_low_pfn; extern unsigned long max_low_pfn; -# define pfn_valid(pfn) (((pfn) < max_low_pfn) && ia64_pfn_valid(pfn)) +# define pfn_valid(pfn) (((pfn) >= min_low_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 |