Most x86 machines aren't Apple machines, especially VMs.
Therefore allow opt-out, making the kernel a few KBs smaller,
eg. for embedded or high-density VMs.

v2: fixed spelling

Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
---
 drivers/acpi/Kconfig    | 9 +++++++++
 drivers/acpi/Makefile   | 2 +-
 drivers/acpi/internal.h | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index edf1558c1105..fc37a9a5c2a8 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -79,6 +79,15 @@ config ACPI_DEBUGGER_USER
 
 endif
 
+config ACPI_APPLE
+       bool "Apple ACPI properties support"
+       default y if X86
+       help
+         Extraction of apple specific ACPI properties.
+
+         Say N if you're sure the kernel won't be used on an Apple machine
+         and wanna save a few kb of memory. (embedded or high-density VMs)
+
 config ACPI_SPCR_TABLE
        bool "ACPI Serial Port Console Redirection Support"
        default y if X86
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 44e412506317..ed1f4405c90a 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -52,7 +52,7 @@ acpi-y                                += evged.o
 acpi-y                         += sysfs.o
 acpi-y                         += property.o
 acpi-$(CONFIG_X86)             += acpi_cmos_rtc.o
-acpi-$(CONFIG_X86)             += x86/apple.o
+acpi-$(CONFIG_ACPI_APPLE)      += x86/apple.o
 acpi-$(CONFIG_X86)             += x86/utils.o
 acpi-$(CONFIG_DEBUG_FS)                += debugfs.o
 acpi-y                         += acpi_lpat.o
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index e3638bafb941..fa1b6ef7829a 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -239,7 +239,7 @@ static inline void suspend_nvs_restore(void) {}
 void acpi_init_properties(struct acpi_device *adev);
 void acpi_free_properties(struct acpi_device *adev);
 
-#ifdef CONFIG_X86
+#ifdef CONFIG_ACPI_APPLE
 void acpi_extract_apple_properties(struct acpi_device *adev);
 #else
 static inline void acpi_extract_apple_properties(struct acpi_device *adev) {}
-- 
2.11.0

Reply via email to