diff options
| author | Len Brown <len.brown@intel.com> | 2003-09-14 16:34:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2003-09-14 16:34:00 -0400 |
| commit | d9c54c1d58d836c545e03cad78331b0168762003 (patch) | |
| tree | 9e32a3b5d6b522887470e69d4e25388cce667d90 /init | |
| parent | 0179c339c2978c01ee6d22bb1693c18ca0a4f12f (diff) | |
| download | history-d9c54c1d58d836c545e03cad78331b0168762003.tar.gz | |
sync 2.4.22 changes into 2.6
Note that this restores CONFIG_ACPI_HT_ONLY as a sub-set of CONFIG_ACPI rather than a dependency.
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 2 | ||||
| -rw-r--r-- | init/do_mounts.h | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 9d7e30252c465b..d9f9d10d68c89c 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -274,8 +274,6 @@ retry: root_device_name, b); 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", __bdevname(ROOT_DEV, b)); diff --git a/init/do_mounts.h b/init/do_mounts.h index 7780dd759d9e51..259de67dd0fa3c 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -79,14 +79,3 @@ 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 - |