diff options
| author | Len Brown <len.brown@intel.com> | 2003-08-12 14:45:03 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2003-08-12 14:45:03 -0400 |
| commit | 12a91a4865636407667bfce4511efbb41859bbe3 (patch) | |
| tree | 03f390765699a123697e44c97e61b1bd8d135b13 /init | |
| parent | fa5e5a424e9456e2b34645b0f4241b77af03eb21 (diff) | |
| download | history-12a91a4865636407667bfce4511efbb41859bbe3.tar.gz | |
ACPI
dmi_scan.c: delete some incomplete code that broke !SMP + APIC build; add ACPI blacklist comment,
move __i386__ out of do_mounts.c and into create mount_root_failed_msg()
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 13 | ||||
| -rw-r--r-- | init/do_mounts.h | 11 |
2 files changed, 14 insertions, 10 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 75fbf8a71c6e2b..9d7e30252c465b 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -273,16 +273,9 @@ retry: printk("VFS: Cannot open root device \"%s\" or %s\n", root_device_name, b); printk("Please append a correct \"root=\" boot option\n"); -#ifdef __i386__ - { - extern void dmi_dump_system(void); - printk ("You may want to retry boot with pci=noacpi, " - "acpi=ht, or acpi=off on the command line.\n"); - printk ("If one of them helps please report it with " - "the following lines:\n"); - dmi_dump_system(); - } -#endif + + 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", __bdevname(ROOT_DEV, b)); diff --git a/init/do_mounts.h b/init/do_mounts.h index 259de67dd0fa3c..7780dd759d9e51 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -79,3 +79,14 @@ void md_run_setup(void); static inline void md_run_setup(void) {} #endif + +#ifdef CONFIG_MOUNT_ROOT_FAILED_MSG + +void mount_root_failed_msg(void); + +#else + +static inline void mount_root_failed_msg(void) {} + +#endif + |