diff --git a/[refs] b/[refs] index e25fbe881aaf..30ac02335af5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a4e143271b97dcaa113761a76942c4d4bc273a2 +refs/heads/master: f40cd6fddcb1d51d8a2a67ddc81c14a3532f3cb7 diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c index 93ad5f40f2ea..2203153b5402 100644 --- a/trunk/drivers/acpi/osl.c +++ b/trunk/drivers/acpi/osl.c @@ -1190,10 +1190,16 @@ acpi_os_validate_interface (char *interface) if (!strcmp("Linux", interface)) { printk(KERN_WARNING PREFIX "System BIOS is requesting _OSI(Linux)\n"); - printk(KERN_WARNING PREFIX - "If \"acpi_osi=Linux\" works better,\n" - "Please send dmidecode " - "to linux-acpi@vger.kernel.org\n"); + if (acpi_dmi_dump()) + printk(KERN_NOTICE PREFIX + "[please extract dmidecode output]\n"); + printk(KERN_NOTICE PREFIX + "Please send DMI info above to " + "linux-acpi@vger.kernel.org\n"); + printk(KERN_NOTICE PREFIX + "If \"acpi_osi=%sLinux\" works better, " + "please notify linux-acpi@vger.kernel.org\n", + osi_linux ? "!" : ""); if(osi_linux) return AE_OK; }