The function kernel_map_pages_in_pgd() will not map pages if NX is disabled, which causes a lot of problems booting in EFI mode (efi_map_region() and other functions depend on this). This patch just makes sure that the NX flag doesn't get set in the page tables if NX is disabled, rather than not mapping the pages at all.
Signed-off-by: Stuart Hayes <[email protected]> --- --- linux-3.16-rc3/arch/x86/mm/pageattr.c.orig 2014-07-02 12:04:49.244288159 -0400 +++ linux-3.16-rc3/arch/x86/mm/pageattr.c 2014-07-02 12:05:55.808290437 -0400 @@ -1862,10 +1862,7 @@ int kernel_map_pages_in_pgd(pgd_t *pgd, .flags = 0, }; - if (!(__supported_pte_mask & _PAGE_NX)) - goto out; - - if (!(page_flags & _PAGE_NX)) + if ((!(__supported_pte_mask & _PAGE_NX)) || !(page_flags & _PAGE_NX)) cpa.mask_clr = __pgprot(_PAGE_NX); cpa.mask_set = __pgprot(_PAGE_PRESENT | page_flags); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
