diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
| commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
| tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /include/asm-ia64 | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/page.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 445e42376..f046dad86 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h @@ -82,7 +82,7 @@ typedef unsigned long pgprot_t; # endif /* !STRICT_MM_TYPECHECKS */ /* - * Note: the MAP_NR() macro can't use __pa() because MAP_NR(X) MUST + * Note: the MAP_NR_*() macro can't use __pa() because MAP_NR_*(X) MUST * map to something >= max_mapnr if X is outside the identity mapped * kernel space. */ @@ -100,12 +100,13 @@ typedef unsigned long pgprot_t; #define MAP_NR_SN1(addr) (((unsigned long) (addr) - PAGE_OFFSET) >> PAGE_SHIFT) #ifdef CONFIG_IA64_GENERIC -# define MAP_NR(addr) platform_map_nr(addr) +# define virt_to_page(kaddr) (mem_map + platform_map_nr(kaddr)) #elif defined (CONFIG_IA64_SN_SN1_SIM) -# define MAP_NR(addr) MAP_NR_SN1(addr) +# define virt_to_page(kaddr) (mem_map + MAP_NR_SN1(kaddr)) #else -# define MAP_NR(addr) MAP_NR_DENSE(addr) +# define virt_to_page(kaddr) (mem_map + MAP_NR_DENSE(kaddr)) #endif +#define VALID_PAGE(page) ((page - mem_map) < max_mapnr) # endif /* __KERNEL__ */ |