aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Makarov <aleksey.makarov@linaro.org>2016-06-20 06:56:12 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-06-21 19:16:14 -0400
commit91dda51a115770fb9f24634fb09a502ad7bda5c6 (patch)
treeda35db8cd68f8a9567bf7eca2a8b90e5a2174548
parent84b06ca319dae15f40fd7ff2bfff4769ab8cc58d (diff)
ACPI / tables: introduce ARCH_HAS_ACPI_TABLE_UPGRADE
We want to use the table upgrade feature in ARM64. Introduce a new configuration option that allows that. Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--drivers/acpi/Kconfig5
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d9a94da0c29f..f1a62447928c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -22,6 +22,7 @@ config X86
22 select ANON_INODES 22 select ANON_INODES
23 select ARCH_CLOCKSOURCE_DATA 23 select ARCH_CLOCKSOURCE_DATA
24 select ARCH_DISCARD_MEMBLOCK 24 select ARCH_DISCARD_MEMBLOCK
25 select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
25 select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE 26 select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
26 select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS 27 select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
27 select ARCH_HAS_DEVMEM_IS_ALLOWED 28 select ARCH_HAS_DEVMEM_IS_ALLOWED
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b7e2e776397d..0a8e41a52d09 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -311,9 +311,12 @@ config ACPI_CUSTOM_DSDT
311 bool 311 bool
312 default ACPI_CUSTOM_DSDT_FILE != "" 312 default ACPI_CUSTOM_DSDT_FILE != ""
313 313
314config ARCH_HAS_ACPI_TABLE_UPGRADE
315 def_bool n
316
314config ACPI_TABLE_UPGRADE 317config ACPI_TABLE_UPGRADE
315 bool "Allow upgrading ACPI tables via initrd" 318 bool "Allow upgrading ACPI tables via initrd"
316 depends on BLK_DEV_INITRD && X86 319 depends on BLK_DEV_INITRD && ARCH_HAS_ACPI_TABLE_UPGRADE
317 default y 320 default y
318 help 321 help
319 This option provides functionality to upgrade arbitrary ACPI tables 322 This option provides functionality to upgrade arbitrary ACPI tables