diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2016-02-01 10:11:57 +0000 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2016-02-01 10:11:57 +0000 |
| commit | b71cf239267e6797023b16a5d4483cbe2c582d47 (patch) | |
| tree | 2de1330ffe13ef9dd36c6283dbcfd1bebdd3dfb3 /arch | |
| parent | 8dc96ffb33aa83cf4a4703517e43cfcdaee4dbce (diff) | |
| parent | 3e841a5becb944727d74464b4a5944b008c2ed16 (diff) | |
Merge tag 'topic-apei-20160122.0' into leg-kernel
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/include/asm/acpi.h | 9 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 116421f54a97..ca7125870722 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -5,6 +5,7 @@ config ARM64 select ACPI_PCI_HOST_GENERIC if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI select ACPI_SPCR_TABLE if ACPI + select HAVE_ACPI_APEI if ACPI select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_GCOV_PROFILE_ALL diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 6db9c6ff53fb..cc1705c59315 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -17,6 +17,7 @@ #include <asm/cputype.h> #include <asm/smp_plat.h> +#include <asm/tlbflush.h> /* Macros for consistency checks of the GICC subtable of MADT */ #define ACPI_MADT_GICC_LENGTH \ @@ -94,7 +95,12 @@ static inline const char *acpi_get_enable_method(int cpu) #ifdef CONFIG_ACPI_APEI pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr); -#endif + +static inline void arch_apei_flush_tlb_one(unsigned long addr) +{ + flush_tlb_kernel_range(addr, addr + PAGE_SIZE); +} +#endif /* CONFIG_ACPI_APEI */ #ifdef CONFIG_ACPI_NUMA int arm64_acpi_numa_init(void); @@ -103,5 +109,4 @@ void acpi_numa_set_node_info(unsigned int cpu, u64 hwid); static inline int arm64_acpi_numa_init(void) { return -ENODEV; } static inline void acpi_numa_set_node_info(unsigned int cpu, u64 hwid) { } #endif /* CONFIG_ACPI_NUMA */ - #endif /*_ASM_ACPI_H*/ diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 102d7d1c958f..0338cdd9d962 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -75,6 +75,7 @@ config X86 select GENERIC_TIME_VSYSCALL select HAVE_ACPI_APEI if ACPI select HAVE_ACPI_APEI_NMI if ACPI + select HAVE_ACPI_APEI_HEST_IA32 if ACPI select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_AOUT if X86_32 select HAVE_ARCH_AUDITSYSCALL |