RE: [PATCH] acpi: fix early DSDT dmi check warnings on ia64

[Lin Ming <ming.m.lin@intel.com>]

On Wed, 2010-05-12 at 07:01 +0800, Luck, Tony wrote:
> +#ifdef CONFIG_X86
>  static struct dmi_system_id dsdt_dmi_table[] __initdata = {
> 
> This #ifdef needs to be a few lines earlier to avoid getting a
> warning:
> 
> drivers/acpi/bus.c:73: 'set_copy_dsdt' defined but not used

Fixed it now. Thanks.

Here is new one,

Subject: [PATCH] acpi: fix early DSDT dmi check warnings on ia64

Tony Luck saw a lot of warning messages 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>
---
 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 c0113e6..9042a85 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[] = {
 };
 
 
+#ifdef CONFIG_X86
 static int set_copy_dsdt(const struct dmi_system_id *id)
 {
 	printk(KERN_NOTICE "%s detected - "
@@ -97,8 +98,14 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
 		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
 		DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"),
 		},
-	}
+	},
+	{}
 };
+#else
+static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+	{}
+};
+#endif
 
 /* --------------------------------------------------------------------------
                                 Device Management


> 
> But otherwise this patch does work and fixes the problem.
> 
> Tested-by: Tony Luck <tony.luck@intel.com>
> 
> Insyde are now writing BIOS for ia64 systems (I have two in
> my lab). I hope they don't copy this bug from their laptop
> BIOS to my systems.  If they do, we'd have to revisit this :-)
> 
> -Tony
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html