summaryrefslogtreecommitdiffstats
path: root/include/asm-s390
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-25 06:33:44 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-25 06:33:44 +0000
commit6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch)
tree41d0361e6b48ce74584c9a6fcb475d5054ca4141 /include/asm-s390
parentee355114ec6062d00c1376b184b886a39e74fd4e (diff)
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'include/asm-s390')
-rw-r--r--include/asm-s390/page.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h
index 49be624a9..e259b2bff 100644
--- a/include/asm-s390/page.h
+++ b/include/asm-s390/page.h
@@ -112,8 +112,8 @@ typedef unsigned long pgprot_t;
#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
-#define MAP_NR(addr) (__pa(addr) >> PAGE_SHIFT)
-#define PHYSMAP_NR(addr) ((unsigned long)(addr) >> PAGE_SHIFT)
+#define virt_to_page(kaddr) (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
+#define VALID_PAGE(page) ((page - mem_map) < max_mapnr)
#endif /* __KERNEL__ */