[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linaro-acpi
Subject:    [Linaro-acpi] [PATCH 05/12] ACPI: ARM: exclude calls on ARM platforms, not include them on x86
From:       al.stone () linaro ! org
Date:       2013-10-23 23:29:44
Message-ID: 1382570991-18055-6-git-send-email-al.stone () linaro ! org
[Download RAW message or body]

From: Al Stone <ahs3@redhat.com>

Corrected #ifdefs to make sure we are not using an ARM platform
(32- or 64-bit), instead of testing whether we are on x86, since
ACPI is used on other platforms as well.

Signed-off-by: Al Stone <al.stone@linaro.org>
---
 drivers/acpi/bus.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 7fcbc6a..ed99fec 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -33,7 +33,7 @@
 #include <linux/proc_fs.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#ifdef CONFIG_X86
+#if !(CONFIG_ARM || CONFIG_ARM64)
 #include <asm/mpspec.h>
 #endif
 #include <linux/pci.h>
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(acpi_root_dir);
 #define STRUCT_TO_INT(s)	(*((int*)&s))
 
 
-#ifdef CONFIG_X86
+#if !(CONFIG_ARM || CONFIG_ARM64)
 static int set_copy_dsdt(const struct dmi_system_id *id)
 {
 	printk(KERN_NOTICE "%s detected - "
@@ -512,7 +512,7 @@ void __init acpi_early_init(void)
 
 	acpi_gbl_permanent_mmap = 1;
 
-#ifdef CONFIG_X86
+#if !(CONFIG_ARM || CONFIG_ARM64)
 	/*
 	 * NB: ARM does not use DMI; only older Intel products do.
 	 *
-- 
1.8.3.1


_______________________________________________
Linaro-acpi mailing list
Linaro-acpi@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-acpi
[prev in list] [next in list] [prev in thread] [next in thread]