Commit df1c4865 authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds

[PATCH] remove mount_root_failed_msg()

This one snuck in...

 - debugging message for ACPI

 - Intel guys removed it from their 2.4 tree (at my request)

 - it's point-in-time specific (message becomes nearly useless after
   ACPI bug fixes)

 - b/c of the point-in-time issue, it's IMO much more appropriate for a
   vendor kernel (where the message, I agree, may be helpful)

 - can potentially mislead users to the correct cause of root mount failure

 - overall, I disagree with adding messages like this.  The number one
   bug report, by far, for networking drivers is ACPI-related (no
   interrupts delivered).  You don't see me adding "boot with acpi=off"
   messages to the net subsystem.
parent f309071a
...@@ -1204,10 +1204,6 @@ source "drivers/pnp/Kconfig" ...@@ -1204,10 +1204,6 @@ source "drivers/pnp/Kconfig"
source "drivers/block/Kconfig" source "drivers/block/Kconfig"
config MOUNT_ROOT_FAILED_MSG
bool
default y
source "drivers/ide/Kconfig" source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig" source "drivers/scsi/Kconfig"
......
...@@ -228,7 +228,6 @@ CONFIG_BLK_DEV_FD=y ...@@ -228,7 +228,6 @@ CONFIG_BLK_DEV_FD=y
# CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_INITRD is not set # CONFIG_BLK_DEV_INITRD is not set
CONFIG_LBD=y CONFIG_LBD=y
CONFIG_MOUNT_ROOT_FAILED_MSG=y
# #
# ATA/ATAPI/MFM/RLL support # ATA/ATAPI/MFM/RLL support
......
...@@ -1116,27 +1116,3 @@ void __init dmi_scan_machine(void) ...@@ -1116,27 +1116,3 @@ void __init dmi_scan_machine(void)
} }
EXPORT_SYMBOL(is_unsafe_smbus); 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 */
...@@ -286,8 +286,6 @@ void __init mount_block_root(char *name, int flags) ...@@ -286,8 +286,6 @@ void __init mount_block_root(char *name, int flags)
root_device_name, b); root_device_name, b);
printk("Please append a correct \"root=\" boot option\n"); printk("Please append a correct \"root=\" boot option\n");
mount_root_failed_msg(); /* architecture dependent */
panic("VFS: Unable to mount root fs on %s", b); panic("VFS: Unable to mount root fs on %s", b);
} }
panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV, b)); panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV, b));
......
...@@ -80,13 +80,3 @@ static inline void md_run_setup(void) {} ...@@ -80,13 +80,3 @@ static inline void md_run_setup(void) {}
#endif #endif
#ifdef CONFIG_MOUNT_ROOT_FAILED_MSG
void mount_root_failed_msg(void);
#else
static inline void mount_root_failed_msg(void) {}
#endif
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