1 files changed, 4 insertions, 4 deletions

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 1aadeb42c5a..b7ebc4fa89b 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -277,11 +277,11 @@ void __init fixrange_init(unsigned long start, unsigned long end,
         k = __pmd_offset(vaddr);
         pgd = pgd_base + i;
 
-        for ( ; (i < PTRS_PER_PGD) && (vaddr != end); pgd++, i++) {
+        for ( ; (i < PTRS_PER_PGD) && (vaddr < end); pgd++, i++) {
                 pud = (pud_t *)pgd;
-                for ( ; (j < PTRS_PER_PUD) && (vaddr != end); pud++, j++) {
+                for ( ; (j < PTRS_PER_PUD) && (vaddr < end); pud++, j++) {
                         pmd = (pmd_t *)pud;
-                        for (; (k < PTRS_PER_PMD) && (vaddr != end); pmd++, k++) {
+                        for (; (k < PTRS_PER_PMD) && (vaddr < end); pmd++, k++) {
                                 if (pmd_none(*pmd)) {
                                         pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
                                         set_pmd(pmd, __pmd((unsigned long)pte));
@@ -368,7 +368,7 @@ void __init mem_init(void)
 #ifdef CONFIG_DISCONTIGMEM
 #error "CONFIG_HIGHMEM and CONFIG_DISCONTIGMEM dont work together yet"
 #endif
-        max_mapnr = highend_pfn;
+        max_mapnr = highend_pfn ? highend_pfn : max_low_pfn;
 #else
         max_mapnr = max_low_pfn;
 #endif