diff options
| author | Keith M. Wesolowski <wesolows@foobazco.org> | 2004-01-08 09:39:49 -0800 |
|---|---|---|
| committer | Keith M. Wesolowski <wesolows@foobazco.org> | 2004-01-08 09:39:49 -0800 |
| commit | 28922d1e809c094efe78a86b6906340897f47260 (patch) | |
| tree | 13f17511706a4ef438ebe3a2915a60f9db91588c | |
| parent | ccc259f421959450a1822ff1e24a7736d377103b (diff) | |
[SPARC]: Fix PMD masking in SRMMU code.
| -rw-r--r-- | arch/sparc/mm/fault.c | 1 | ||||
| -rw-r--r-- | arch/sparc/mm/srmmu.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c index 1276d7700f2a..aa6df77cf886 100644 --- a/arch/sparc/mm/fault.c +++ b/arch/sparc/mm/fault.c @@ -36,7 +36,6 @@ #define ELEMENTS(arr) (sizeof (arr)/sizeof (arr[0])) -extern struct sparc_phys_banks sp_banks[SPARC_PHYS_BANKS+1]; extern int prom_node_root; /* At boot time we determine these two values necessary for setting diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 7d40b4c005bc..5109625cad58 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -349,7 +349,7 @@ void srmmu_free_nocache(unsigned long vaddr, int size) vaddr, (unsigned long)SRMMU_NOCACHE_VADDR); BUG(); } - if (vaddr+size >= srmmu_nocache_end) { + if (vaddr+size > srmmu_nocache_end) { printk("Vaddr %lx is bigger than nocache end 0x%lx\n", vaddr, srmmu_nocache_end); BUG(); @@ -1071,7 +1071,7 @@ void __init srmmu_early_allocate_ptable_skeleton(unsigned long start, unsigned l } if (start > (0xffffffffUL - SRMMU_PMD_SIZE_SOFT)) break; - start = (start + SRMMU_PMD_SIZE) & SRMMU_PMD_MASK; + start = (start + SRMMU_PMD_SIZE_SOFT) & SRMMU_PMD_MASK_SOFT; } } @@ -1101,7 +1101,7 @@ void __init srmmu_allocate_ptable_skeleton(unsigned long start, unsigned long en } if (start > (0xffffffffUL - SRMMU_PMD_SIZE_SOFT)) break; - start = (start + SRMMU_PMD_SIZE) & SRMMU_PMD_MASK; + start = (start + SRMMU_PMD_SIZE_SOFT) & SRMMU_PMD_MASK_SOFT; } } |