diff options
author | Lin Ming <ming.m.lin@intel.com> | 2010-05-11 21:26:48 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-05-19 23:56:00 -0400 |
commit | cce4f632db200aef147c59084437168174b23f11 (patch) | |
tree | fee9f3cc87119d6d45f035d91993f18ff8c98a1e /drivers/acpi | |
parent | 2aae2d918d88fdf0f8c066520cda0a30409db23f (diff) |
ACPI: fix early DSDT dmi check warnings on ia64
WARNING: at drivers/firmware/dmi_scan.c:423 dmi_matches+0x70/0x160()
dmi check: not initialized yet.
This is caused by commit aa2110c
(ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT).
DMI is not initialized yet in acpi_early_init on ia64.
The DSDT DMI check table is x86 specific, so make it empty on other archs.
And this fixes the warnings on ia64.
Reported-and-tested-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/bus.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 49af19bb8c9b..e1bfe7164245 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -69,6 +69,7 @@ static struct dmi_system_id __cpuinitdata power_nocheck_dmi_table[] = { | |||
69 | }; | 69 | }; |
70 | 70 | ||
71 | 71 | ||
72 | #ifdef CONFIG_X86 | ||
72 | static int set_copy_dsdt(const struct dmi_system_id *id) | 73 | static int set_copy_dsdt(const struct dmi_system_id *id) |
73 | { | 74 | { |
74 | printk(KERN_NOTICE "%s detected - " | 75 | printk(KERN_NOTICE "%s detected - " |
@@ -97,8 +98,14 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = { | |||
97 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | 98 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |
98 | DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"), | 99 | DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"), |
99 | }, | 100 | }, |
100 | } | 101 | }, |
102 | {} | ||
101 | }; | 103 | }; |
104 | #else | ||
105 | static struct dmi_system_id dsdt_dmi_table[] __initdata = { | ||
106 | {} | ||
107 | }; | ||
108 | #endif | ||
102 | 109 | ||
103 | /* -------------------------------------------------------------------------- | 110 | /* -------------------------------------------------------------------------- |
104 | Device Management | 111 | Device Management |