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-sparc | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/page.h | 3 | ||||
| -rw-r--r-- | include/asm-sparc/pgtable.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h index c727c06d8..47022fbba 100644 --- a/include/asm-sparc/page.h +++ b/include/asm-sparc/page.h @@ -177,7 +177,8 @@ extern __inline__ int get_order(unsigned long size) #define PAGE_OFFSET 0xf0000000 #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 virt_to_page(kaddr) (mem_map + (__pa(kaddr) >> PAGE_SHIFT)) +#define VALID_PAGE(page) ((page - mem_map) < max_mapnr) #endif /* __KERNEL__ */ diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h index 5fc507132..2debbf084 100644 --- a/include/asm-sparc/pgtable.h +++ b/include/asm-sparc/pgtable.h @@ -1,4 +1,4 @@ -/* $Id: pgtable.h,v 1.99 2000/08/05 13:30:34 davem Exp $ */ +/* $Id: pgtable.h,v 1.101 2000/08/09 00:00:17 davem Exp $ */ #ifndef _SPARC_PGTABLE_H #define _SPARC_PGTABLE_H @@ -147,9 +147,6 @@ extern pte_t pg3[1024]; extern unsigned long ptr_in_current_pgd; -/* the no. of pointers that fit on a page: this will go away */ -#define PTRS_PER_PAGE (PAGE_SIZE/sizeof(void*)) - /* Here is a trick, since mmap.c need the initializer elements for * protection_map[] to be constant at compile time, I set the following * to all zeros. I set it to the real values after I link in the |