Commit 72c0542e authored by Patrick Mochel's avatar Patrick Mochel

[x86] Kill warning in dmi_scan.c

- Wrap unused function in same #ifdef as caller.
- Boggle as to WTF CONFIG_MOUNT_ROOT_FAILED_MSG is supposed to do.
parent 98256b56
...@@ -162,20 +162,6 @@ enum ...@@ -162,20 +162,6 @@ enum
static char *dmi_ident[DMI_STRING_MAX]; static char *dmi_ident[DMI_STRING_MAX];
/* print some information suitable for a blacklist entry. */
static void dmi_dump_system(void)
{
printk("DMI: BIOS: %.40s, %.40s, %.40s\n",
dmi_ident[DMI_BIOS_VENDOR], dmi_ident[DMI_BIOS_VERSION],
dmi_ident[DMI_BIOS_DATE]);
printk("DMI: System: %.40s, %.40s, %.40s\n",
dmi_ident[DMI_SYS_VENDOR], dmi_ident[DMI_PRODUCT_NAME],
dmi_ident[DMI_PRODUCT_VERSION]);
printk("DMI: Board: %.40s, %.40s, %.40s\n",
dmi_ident[DMI_BOARD_VENDOR], dmi_ident[DMI_BOARD_NAME],
dmi_ident[DMI_BOARD_VERSION]);
}
/* /*
* Save a DMI string * Save a DMI string
*/ */
...@@ -1118,6 +1104,25 @@ void __init dmi_scan_machine(void) ...@@ -1118,6 +1104,25 @@ void __init dmi_scan_machine(void)
EXPORT_SYMBOL(is_unsafe_smbus); EXPORT_SYMBOL(is_unsafe_smbus);
#ifdef CONFIG_MOUNT_ROOT_FAILED_MSG #ifdef CONFIG_MOUNT_ROOT_FAILED_MSG
#ifdef CONFIG_ACPI_BOOT
/* print some information suitable for a blacklist entry. */
static void dmi_dump_system(void)
{
printk("DMI: BIOS: %.40s, %.40s, %.40s\n",
dmi_ident[DMI_BIOS_VENDOR], dmi_ident[DMI_BIOS_VERSION],
dmi_ident[DMI_BIOS_DATE]);
printk("DMI: System: %.40s, %.40s, %.40s\n",
dmi_ident[DMI_SYS_VENDOR], dmi_ident[DMI_PRODUCT_NAME],
dmi_ident[DMI_PRODUCT_VERSION]);
printk("DMI: Board: %.40s, %.40s, %.40s\n",
dmi_ident[DMI_BOARD_VENDOR], dmi_ident[DMI_BOARD_NAME],
dmi_ident[DMI_BOARD_VERSION]);
}
/* /*
* mount_root_failed_msg() * mount_root_failed_msg()
* *
...@@ -1130,13 +1135,20 @@ EXPORT_SYMBOL(is_unsafe_smbus); ...@@ -1130,13 +1135,20 @@ EXPORT_SYMBOL(is_unsafe_smbus);
void void
mount_root_failed_msg(void) mount_root_failed_msg(void)
{ {
#ifdef CONFIG_ACPI_BOOT
printk ("Try booting with pci=noacpi, acpi=ht, " printk ("Try booting with pci=noacpi, acpi=ht, "
"or acpi=off on the command line.\n"); "or acpi=off on the command line.\n");
printk ("If one helps, please report the following lines:\n"); printk ("If one helps, please report the following lines:\n");
dmi_dump_system(); dmi_dump_system();
#endif
} }
#else
void mount_root_failed_msg(void)
{
}
#endif
#endif /* CONFIG_MOUNT_ROOT_FAILED_MSG */ #endif /* CONFIG_MOUNT_ROOT_FAILED_MSG */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment