diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-30 22:00:04 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-30 22:00:04 +0100 |
| commit | 07b188ab773e183871e57b33ae37bf635c9f12ba (patch) | |
| tree | 311df8a0dd12fb7bd3e9b5b1a5ca500f0428d679 /include/asm-ia64/page.h | |
| parent | Merge branch 'master' of /usr/src/ntfs-2.6/ (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| download | linux-07b188ab773e183871e57b33ae37bf635c9f12ba.tar.xz linux-07b188ab773e183871e57b33ae37bf635c9f12ba.zip | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/asm-ia64/page.h')
| -rw-r--r-- | include/asm-ia64/page.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 9edffad8c28b..ef436b9d06ad 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h @@ -102,15 +102,15 @@ do { \ #ifdef CONFIG_VIRTUAL_MEM_MAP extern int ia64_pfn_valid (unsigned long pfn); -#else +#elif defined(CONFIG_FLATMEM) # define ia64_pfn_valid(pfn) 1 #endif -#ifndef CONFIG_DISCONTIGMEM +#ifdef CONFIG_FLATMEM # 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 +#elif defined(CONFIG_DISCONTIGMEM) extern struct page *vmem_map; extern unsigned long max_low_pfn; # define pfn_valid(pfn) (((pfn) < max_low_pfn) && ia64_pfn_valid(pfn)) |