--- v8
+++ v10
@@ -16,22 +16,31 @@
Signed-off-by: Jonathan (Zhixiong) Zhang <zjzhang@codeaurora.org>
---
- arch/x86/kernel/acpi/apei.c | 19 +++++++++++++++++++
- include/acpi/apei.h | 1 +
- 2 files changed, 20 insertions(+)
+ arch/x86/include/asm/acpi.h | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
-diff --git a/arch/x86/kernel/acpi/apei.c b/arch/x86/kernel/acpi/apei.c
-index c280df6b2aa2..675bd46c4e17 100644
---- a/arch/x86/kernel/acpi/apei.c
-+++ b/arch/x86/kernel/acpi/apei.c
-@@ -60,3 +60,22 @@ void arch_apei_flush_tlb_one(unsigned long addr)
- {
- __flush_tlb_one(addr);
- }
+diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
+index 3a45668f6dc3..ffe22c6b17bd 100644
+--- a/arch/x86/include/asm/acpi.h
++++ b/arch/x86/include/asm/acpi.h
+@@ -32,6 +32,10 @@
+ #include <asm/mpspec.h>
+ #include <asm/realmode.h>
+
++#ifdef CONFIG_ACPI_APEI
++#include <asm/pgtable_types.h>
++#endif
+
+ #ifdef CONFIG_ACPI
+ extern int acpi_lapic;
+ extern int acpi_ioapic;
+@@ -147,4 +151,24 @@ extern int x86_acpi_numa_init(void);
+
+ #define acpi_unlazy_tlb(x) leave_mm(x)
+
++#ifdef CONFIG_ACPI_APEI
+static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr)
+{
-+
+ /*
+ * We currently have no way to lookup the EFI memory map
+ * attributes for a region in a consistent way because the
@@ -45,20 +54,11 @@
+ * until we know differently.
+ */
+
-+ return PAGE_KERNEL;
++ return PAGE_KERNEL;
+}
-diff --git a/include/acpi/apei.h b/include/acpi/apei.h
-index 284801ac7042..64a12ce9880b 100644
---- a/include/acpi/apei.h
-+++ b/include/acpi/apei.h
-@@ -46,6 +46,7 @@ int erst_clear(u64 record_id);
- int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data);
- void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err);
- void arch_apei_flush_tlb_one(unsigned long addr);
-+pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr);
-
- #endif
- #endif
++#endif
++
+ #endif /* _ASM_X86_ACPI_H */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project