projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
include
/
asm
/
acpi.h
diff --git
a/arch/arm64/include/asm/acpi.h
b/arch/arm64/include/asm/acpi.h
index 406485ed110af9fb12ce8040815355442d088444..5f8a38dee2744d6655bb6eceb3cabf6917c80ad4 100644
(file)
--- a/
arch/arm64/include/asm/acpi.h
+++ b/
arch/arm64/include/asm/acpi.h
@@
-12,11
+12,11
@@
#ifndef _ASM_ACPI_H
#define _ASM_ACPI_H
#ifndef _ASM_ACPI_H
#define _ASM_ACPI_H
-#include <linux/mm.h>
#include <linux/irqchip/arm-gic-acpi.h>
#include <linux/irqchip/arm-gic-acpi.h>
+#include <linux/mm.h>
+#include <linux/psci.h>
#include <asm/cputype.h>
#include <asm/cputype.h>
-#include <asm/psci.h>
#include <asm/smp_plat.h>
/* Macros for consistency checks of the GICC subtable of MADT */
#include <asm/smp_plat.h>
/* Macros for consistency checks of the GICC subtable of MADT */
@@
-92,4
+92,9
@@
static inline const char *acpi_get_enable_method(int cpu)
{
return acpi_psci_present() ? "psci" : NULL;
}
{
return acpi_psci_present() ? "psci" : NULL;
}
+
+#ifdef CONFIG_ACPI_APEI
+pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr);
+#endif
+
#endif /*_ASM_ACPI_H*/
#endif /*_ASM_ACPI_H*/