From 835ff89004c5988d2df229a106116a9695839aa5 Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Wed, 20 Aug 2003 21:56:44 -0700 Subject: [PATCH] [dmi] Ugh, fixup broken merge once and for all. - Didn't realize that mount_root_failed_msg() had been removed, so it was accidentally merged back in. It's gone again now, as well as the entire (unused) dmi_dump_system() function. --- arch/i386/kernel/dmi_scan.c | 41 ------------------------------------- 1 file changed, 41 deletions(-) diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c index a63a540753e92..e19e3bab3cf40 100644 --- a/arch/i386/kernel/dmi_scan.c +++ b/arch/i386/kernel/dmi_scan.c @@ -162,23 +162,6 @@ enum static char *dmi_ident[DMI_STRING_MAX]; -#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]); -} - -#endif /* * Save a DMI string */ @@ -1119,27 +1102,3 @@ void __init dmi_scan_machine(void) } EXPORT_SYMBOL(is_unsafe_smbus); - -#ifdef CONFIG_MOUNT_ROOT_FAILED_MSG -/* - * mount_root_failed_msg() - * - * Called from mount_block_root() upon failure to mount root. - * architecture dependent to give different platforms - * the opportunity to print different handy messages - * On x86 this lives here b/c it dumps out some DMI info. - */ - -void -mount_root_failed_msg(void) -{ -#ifdef CONFIG_ACPI_BOOT - printk ("Try booting with pci=noacpi, acpi=ht, " - "or acpi=off on the command line.\n"); - printk ("If one helps, please report the following lines:\n"); - - dmi_dump_system(); -#endif -} -#endif /* CONFIG_MOUNT_ROOT_FAILED_MSG */ - -- 2.53.0