Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/arm64/include/asm/acpi.h
Simple merge

diff --cc arch/arm64/include/asm/memory.h
Simple merge

diff --cc arch/arm64/include/asm/pgtable.h
index 0a105e3254a1571f9d035dc661f9dc30ac65e3c8,26b066690593cd6304e81fdd24465a25ace2f396..571ca0ed4f0565378131b25f317ef8b2f819c3b2
--- 1/arch/arm64/include/asm/pgtable.h
--- 2/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))

diff --cc arch/arm64/mm/proc.S
Simple merge

diff --cc arch/x86/boot/header.S
Simple merge

diff --cc arch/x86/platform/efi/efi.c
Simple merge

diff --cc drivers/acpi/apei/ghes.c
Simple merge