On 10/25/2013 04:02 AM, Hanjun Guo wrote:
On 2013-10-25 6:23, al.stone@linaro.org wrote:
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.
Will this break IA64? I think CONFIG_X86 used here may have special handler for x86 only. anyway, I have no full confidence about it :)
Thanks Hanjun
Aha. git blame is marvelous. I had thought these were #ifdef CONFIG_X86 lines that *I* had put in to get things to work on ARM; not true, it turns out, except for the last one. I'll fix this patch so only the last part is used.
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. *