diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips64/kernel/head.S | 5 | ||||
| -rw-r--r-- | arch/mips64/mm/init.c | 7 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-memory.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips64/kernel/head.S b/arch/mips64/kernel/head.S index 7958ae36f..7292b77ff 100644 --- a/arch/mips64/kernel/head.S +++ b/arch/mips64/kernel/head.S @@ -167,7 +167,8 @@ NESTED(bootstrap, 16, sp) .align 12 page swapper_pg_dir, 1 - page invalid_pte_table, 1 + page invalid_pte_table, 0 page invalid_pmd_table, 1 - page empty_bad_page_table, 1 + page empty_bad_page_table, 0 + page empty_bad_pmd_table, 1 page empty_bad_page diff --git a/arch/mips64/mm/init.c b/arch/mips64/mm/init.c index 97c68c6cc..c6b301e14 100644 --- a/arch/mips64/mm/init.c +++ b/arch/mips64/mm/init.c @@ -161,7 +161,7 @@ pte_t *get_pte_slow(pmd_t *pmd, unsigned long offset) { pte_t *page; - page = (pte_t *) __get_free_pages(GFP_KERNEL, 1); + page = (pte_t *) __get_free_pages(GFP_KERNEL, 0); if (pmd_none(*pmd)) { if (page) { clear_page(page); @@ -171,7 +171,7 @@ pte_t *get_pte_slow(pmd_t *pmd, unsigned long offset) pmd_set(pmd, BAD_PAGETABLE); return NULL; } - free_pages((unsigned long)page, 1); + free_pages((unsigned long)page, 0); if (pmd_bad(*pmd)) { __bad_pte(pmd); return NULL; @@ -287,7 +287,6 @@ pmd_t * __bad_pmd_table(void) pte_t * __bad_pagetable(void) { - extern char empty_bad_page_table[PAGE_SIZE]; unsigned long page; page = (unsigned long) empty_bad_page_table; @@ -348,7 +347,7 @@ void __init paging_init(void) /* Initialize the entire pgd. */ pgd_init((unsigned long)swapper_pg_dir); pmd_init((unsigned long)invalid_pmd_table); - memset((void *)invalid_pte_table, 0, sizeof(pte_t) * 2 * PTRS_PER_PTE); + memset((void *)invalid_pte_table, 0, sizeof(pte_t) * PTRS_PER_PTE); max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; low = max_low_pfn; diff --git a/arch/mips64/sgi-ip27/ip27-memory.c b/arch/mips64/sgi-ip27/ip27-memory.c index ff218d1d2..ddc01c1f1 100644 --- a/arch/mips64/sgi-ip27/ip27-memory.c +++ b/arch/mips64/sgi-ip27/ip27-memory.c @@ -249,7 +249,7 @@ void __init paging_init(void) /* Initialize the entire pgd. */ pgd_init((unsigned long)swapper_pg_dir); pmd_init((unsigned long)invalid_pmd_table); - memset((void *)invalid_pte_table, 0, sizeof(pte_t) * 2 * PTRS_PER_PTE); + memset((void *)invalid_pte_table, 0, sizeof(pte_t) * PTRS_PER_PTE); for (node = 0; node < numnodes; node++) { pfn_t start_pfn = slot_getbasepfn(node, 0); |