diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:41:01 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:41:01 +0200 |
| commit | d5f017b796611c03d8b808d90eec0559c9049207 (patch) | |
| tree | c82291f92a26c4304236da18b06364bb44fe643f /arch/arm64/include/asm/acpi.h | |
| parent | Merge branch 'acpi-numa' (diff) | |
| parent | ACPI: Rename configfs.c to acpi_configfs.c to prevent link error (diff) | |
| download | linux-dev-d5f017b796611c03d8b808d90eec0559c9049207.tar.xz linux-dev-d5f017b796611c03d8b808d90eec0559c9049207.zip | |
Merge branch 'acpi-tables'
* acpi-tables:
ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
ACPI: add support for loading SSDTs via configfs
ACPI: add support for configfs
efi / ACPI: load SSTDs from EFI variables
spi / ACPI: add support for ACPI reconfigure notifications
i2c / ACPI: add support for ACPI reconfigure notifications
ACPI: add support for ACPI reconfiguration notifiers
ACPI / scan: fix enumeration (visited) flags for bus rescans
ACPI / documentation: add SSDT overlays documentation
ACPI: ARM64: support for ACPI_TABLE_UPGRADE
ACPI / tables: introduce ARCH_HAS_ACPI_TABLE_UPGRADE
ACPI / tables: move arch-specific symbol to asm/acpi.h
ACPI / tables: table upgrade: refactor function definitions
ACPI / tables: table upgrade: use cacheable map for tables
Conflicts:
arch/arm64/include/asm/acpi.h
Diffstat (limited to 'arch/arm64/include/asm/acpi.h')
| -rw-r--r-- | arch/arm64/include/asm/acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 4b13ecd3977a..5420cb0fcb3e 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -121,4 +121,6 @@ static inline int arm64_acpi_numa_init(void) { return -ENOSYS; } static inline int acpi_numa_get_nid(unsigned int cpu, u64 hwid) { return NUMA_NO_NODE; } #endif /* CONFIG_ACPI_NUMA */ +#define ACPI_TABLE_UPGRADE_MAX_PHYS MEMBLOCK_ALLOC_ACCESSIBLE + #endif /*_ASM_ACPI_H*/ |