Commit 28922d1e authored by Keith M. Wesolowski's avatar Keith M. Wesolowski

[SPARC]: Fix PMD masking in SRMMU code.

parent ccc259f4
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#define ELEMENTS(arr) (sizeof (arr)/sizeof (arr[0])) #define ELEMENTS(arr) (sizeof (arr)/sizeof (arr[0]))
extern struct sparc_phys_banks sp_banks[SPARC_PHYS_BANKS+1];
extern int prom_node_root; extern int prom_node_root;
/* At boot time we determine these two values necessary for setting /* At boot time we determine these two values necessary for setting
......
...@@ -349,7 +349,7 @@ void srmmu_free_nocache(unsigned long vaddr, int size) ...@@ -349,7 +349,7 @@ void srmmu_free_nocache(unsigned long vaddr, int size)
vaddr, (unsigned long)SRMMU_NOCACHE_VADDR); vaddr, (unsigned long)SRMMU_NOCACHE_VADDR);
BUG(); BUG();
} }
if (vaddr+size >= srmmu_nocache_end) { if (vaddr+size > srmmu_nocache_end) {
printk("Vaddr %lx is bigger than nocache end 0x%lx\n", printk("Vaddr %lx is bigger than nocache end 0x%lx\n",
vaddr, srmmu_nocache_end); vaddr, srmmu_nocache_end);
BUG(); BUG();
...@@ -1071,7 +1071,7 @@ void __init srmmu_early_allocate_ptable_skeleton(unsigned long start, unsigned l ...@@ -1071,7 +1071,7 @@ void __init srmmu_early_allocate_ptable_skeleton(unsigned long start, unsigned l
} }
if (start > (0xffffffffUL - SRMMU_PMD_SIZE_SOFT)) if (start > (0xffffffffUL - SRMMU_PMD_SIZE_SOFT))
break; 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 ...@@ -1101,7 +1101,7 @@ void __init srmmu_allocate_ptable_skeleton(unsigned long start, unsigned long en
} }
if (start > (0xffffffffUL - SRMMU_PMD_SIZE_SOFT)) if (start > (0xffffffffUL - SRMMU_PMD_SIZE_SOFT))
break; break;
start = (start + SRMMU_PMD_SIZE) & SRMMU_PMD_MASK; start = (start + SRMMU_PMD_SIZE_SOFT) & SRMMU_PMD_MASK_SOFT;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment