diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-07-03 02:27:04 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-07-04 14:01:40 +0200 |
| commit | 0cc15d03bcccdf95e2bd82e094e6064e61b54207 (patch) | |
| tree | f6ec256f60f185089e306096a73fbf12b5b8788e /drivers/block | |
| parent | Merge branch 'for-3.5/drivers' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-0cc15d03bcccdf95e2bd82e094e6064e61b54207.tar.xz linux-0cc15d03bcccdf95e2bd82e094e6064e61b54207.zip | |
floppy: Run floppy initialization asynchronous
floppy_init is quite slow, 3s on my test system to determine
that there is no floppy. Run it asynchronous to the other
init calls to improve boot time.
[jkosina@suse.cz: fix modular build]
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index cce7df367b79..1347ba8b8377 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -191,6 +191,7 @@ static int print_unex = 1; #include <linux/mutex.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/async.h> /* * PS/2 floppies have much slower step rates than regular floppies. @@ -4122,7 +4123,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data) return get_disk(disks[drive]); } -static int __init floppy_init(void) +static int __init do_floppy_init(void) { int i, unit, drive; int err, dr; @@ -4337,6 +4338,24 @@ out_put_disk: return err; } +#ifndef MODULE +static __init void floppy_async_init(void *data, async_cookie_t cookie) +{ + do_floppy_init(); +} +#endif + +static int __init floppy_init(void) +{ +#ifdef MODULE + return do_floppy_init(); +#else + /* Don't hold up the bootup by the floppy initialization */ + async_schedule(floppy_async_init, NULL); + return 0; +#endif +} + static const struct io_region { int offset; int size; |