diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-08-28 23:24:03 +0000 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-08-28 23:24:03 +0000 |
| commit | 6702c3fd03eb3e6ce6cc373cb45b8191ede490bb (patch) | |
| tree | 2718fa38a2d2da929bc7067fbdcbbaa83057c382 | |
| parent | 4e58f5393e397826da756945ffb84c3923a86c52 (diff) | |
fixed MAP_NR() second try:-(
| -rw-r--r-- | include/asm-mips/page.h | 5 | ||||
| -rw-r--r-- | include/asm-mips/pgtable.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index 36c0a73e2..3629f496d 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h @@ -1,4 +1,4 @@ -/* $Id: page.h,v 1.3 1998/07/13 23:29:09 tsbogend Exp $ +/* $Id: page.h,v 1.4 1998/08/25 09:21:59 ralf Exp $ * * Definitions for page handling * @@ -129,8 +129,7 @@ typedef unsigned long pgprot_t; #define PAGE_OFFSET 0x80000000UL #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET)) -#define MAP_MASK 0x1fffffffUL -#define MAP_NR(addr) ((((unsigned long)(addr)) & MAP_MASK) >> PAGE_SHIFT) +#define MAP_NR(addr) (__pa(addr) >> PAGE_SHIFT) #endif /* defined (__KERNEL__) */ diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index dccd199ad..1005aa6fb 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h @@ -1,4 +1,4 @@ -/* $Id: pgtable.h,v 1.14 1998/07/16 19:10:04 ralf Exp $ +/* $Id: pgtable.h,v 1.15 1998/08/25 09:21:59 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -356,7 +356,7 @@ extern inline pte_t mk_pte(unsigned long page, pgprot_t pgprot) extern inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot) { - return __pte((physpage - PAGE_OFFSET) | pgprot_val(pgprot)); + return __pte(physpage | pgprot_val(pgprot)); } extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot) |