From: Jeremy Fitzhardinge Date: Sun, 7 Sep 2008 22:21:17 +0000 (-0700) Subject: x86-64: don't check for map replacement X-Git-Tag: v2.6.28-rc1~611^2~66 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a32ad4626776f09b30ef98a872a5f6fb64fe6607;p=linux-2.6-omap-h63xx.git x86-64: don't check for map replacement The check prevents flags on mappings from being changed, which is not desireable. There's no need to check for replacing a mapping, and x86-32 does not do this check. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 5beb8968345..7c8bb46e83e 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -196,9 +196,6 @@ set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte) } pte = pte_offset_kernel(pmd, vaddr); - if (!pte_none(*pte) && pte_val(new_pte) && - pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask)) - pte_ERROR(*pte); set_pte(pte, new_pte); /*