diff options
| author | Tejun Heo <tj@kernel.org> | 2013-01-18 22:05:56 (GMT) |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-01-18 22:05:56 (GMT) |
| commit | bb813f4c933ae9f887a014483690d5f8b8ec05e1 (patch) | |
| tree | 04107b0ae2d1881960dea63b623915db159ecacc /init/do_mounts_initrd.c | |
| parent | 84b233adcca3cacd5cfa8013a5feda7a3db4a9af (diff) | |
| download | linux-fsl-qoriq-bb813f4c933ae9f887a014483690d5f8b8ec05e1.tar.xz | |
init, block: try to load default elevator module early during boot
This patch adds default module loading and uses it to load the default
block elevator. During boot, it's called right after initramfs or
initrd is made available and right before control is passed to
userland. This ensures that as long as the modules are available in
the usual places in initramfs, initrd or the root filesystem, the
default modules are loaded as soon as possible.
This will replace the on-demand elevator module loading from elevator
init path.
v2: Fixed build breakage when !CONFIG_BLOCK. Reported by kbuild test
robot.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alex Riesen <raa.lkml@gmail.com>
Cc: Fengguang We <fengguang.wu@intel.com>
Diffstat (limited to 'init/do_mounts_initrd.c')
| -rw-r--r-- | init/do_mounts_initrd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 5e4ded5..dfe606a 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -57,6 +57,9 @@ static void __init handle_initrd(void) sys_mkdir("/old", 0700); sys_chdir("/old"); + /* try loading default modules from initrd */ + load_default_modules(); + /* * In case that a resume from disk is carried out by linuxrc or one of * its children, we need to tell the freezer not to wait for us. |