From: Ingo Molnar Date: Wed, 14 Oct 2015 14:05:18 +0000 (+0200) Subject: Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix X-Git-Tag: KARO-TX6UL-2015-11-03~56^2~22^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c7d77a7980e434c3af17de19e3348157f9b9ccce;p=karo-tx-linux.git Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix Signed-off-by: Ingo Molnar --- c7d77a7980e434c3af17de19e3348157f9b9ccce diff --cc arch/arm64/include/asm/pgtable.h index 0a105e3254a1,26b066690593..571ca0ed4f05 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@@ -53,18 -57,11 +57,13 @@@ extern void __pmd_error(const char *fil extern void __pud_error(const char *file, int line, unsigned long val); extern void __pgd_error(const char *file, int line, unsigned long val); - #ifdef CONFIG_SMP #define PROT_DEFAULT (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) #define PROT_SECT_DEFAULT (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) - #else - #define PROT_DEFAULT (PTE_TYPE_PAGE | PTE_AF) - #define PROT_SECT_DEFAULT (PMD_TYPE_SECT | PMD_SECT_AF) - #endif +#define PROT_DEVICE_nGnRnE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_DEVICE_nGnRnE)) #define PROT_DEVICE_nGnRE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_DEVICE_nGnRE)) #define PROT_NORMAL_NC (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_NORMAL_NC)) +#define PROT_NORMAL_WT (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_NORMAL_WT)) #define PROT_NORMAL (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_NORMAL)) #define PROT_SECT_DEVICE_nGnRE (PROT_SECT_DEFAULT | PMD_SECT_PXN | PMD_SECT_UXN | PMD_ATTRINDX(MT_DEVICE_nGnRE))