From: Catalin Marinas Date: Mon, 14 Feb 2011 11:58:04 +0000 (+0100) Subject: ARM: 6667/1: Fix early_pte_alloc() assumption about the Linux PTE X-Git-Tag: v2.6.39-rc1~100^2~2^3~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=410f14837a92177242a403c20d0a0906fe357019;p=profile%2Fivi%2Fkernel-x86-ivi.git ARM: 6667/1: Fix early_pte_alloc() assumption about the Linux PTE With LPAE we no longer have software bits in a separate Linux PTE and the early_pte_alloc() function should pass PTE_HWTABLE_OFF + PTE_HWTABLE_SIZE to early_alloc() to avoid allocating extra memory. Signed-off-by: Catalin Marinas Signed-off-by: Russell King --- diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 546e447..7515d47 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -532,7 +532,7 @@ static void __init *early_alloc(unsigned long sz) static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr, unsigned long prot) { if (pmd_none(*pmd)) { - pte_t *pte = early_alloc(2 * PTRS_PER_PTE * sizeof(pte_t)); + pte_t *pte = early_alloc(PTE_HWTABLE_OFF + PTE_HWTABLE_SIZE); __pmd_populate(pmd, __pa(pte), prot); } BUG_ON(pmd_bad(*pmd));