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-arm | |
parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-sa1100/mmzone.h | 2 | ||||
-rw-r--r-- | include/asm-arm/page.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/arch-sa1100/mmzone.h b/include/asm-arm/arch-sa1100/mmzone.h index b7abea6f7..c721a1d55 100644 --- a/include/asm-arm/arch-sa1100/mmzone.h +++ b/include/asm-arm/arch-sa1100/mmzone.h @@ -79,3 +79,5 @@ extern pg_data_t sa1100_node_data[]; (((unsigned long)ADDR_TO_MAPBASE((kaddr)) - PAGE_OFFSET) / \ sizeof(mem_map_t))) +#define virt_to_page(kaddr) (mem_map + MAP_NR(kaddr)) +#define VALID_PAGE(page) ((page - mem_map) < max_mapnr) diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index 10f470048..4f24702a2 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h @@ -92,6 +92,8 @@ extern __inline__ int get_order(unsigned long size) #ifndef CONFIG_DISCONTIGMEM #define MAP_NR(addr) ((__pa(addr) - PHYS_OFFSET) >> PAGE_SHIFT) +#define virt_to_page(kaddr) (mem_map + ((__pa(kaddr) - PHYS_OFFSET) >> PAGE_SHIFT)) +#define VALID_PAGE(page) ((page - mem_map) < max_mapnr) #endif #endif |