diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-10 05:20:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-10 12:57:21 -0500 |
| commit | fdee8ae4498c48b44c0eac592f9c6ed24c4517c1 (patch) | |
| tree | 9d77e7fec74adb9c3689f565dfcbf2890ab5ccbe | |
| parent | b875e531fc82db592d6093594593d5cafde0a1cd (diff) | |
[PATCH] MD: conditionalize some code
The autorun code is only used if this module is built into the static
kernel image. Adjust #ifdefs accordingly.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 08c2d78e5737..763ecab34813 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -3371,6 +3371,7 @@ out: | |||
| 3371 | return err; | 3371 | return err; |
| 3372 | } | 3372 | } |
| 3373 | 3373 | ||
| 3374 | #ifndef MODULE | ||
| 3374 | static void autorun_array(mddev_t *mddev) | 3375 | static void autorun_array(mddev_t *mddev) |
| 3375 | { | 3376 | { |
| 3376 | mdk_rdev_t *rdev; | 3377 | mdk_rdev_t *rdev; |
| @@ -3485,6 +3486,7 @@ static void autorun_devices(int part) | |||
| 3485 | } | 3486 | } |
| 3486 | printk(KERN_INFO "md: ... autorun DONE.\n"); | 3487 | printk(KERN_INFO "md: ... autorun DONE.\n"); |
| 3487 | } | 3488 | } |
| 3489 | #endif /* !MODULE */ | ||
| 3488 | 3490 | ||
| 3489 | static int get_version(void __user * arg) | 3491 | static int get_version(void __user * arg) |
| 3490 | { | 3492 | { |
| @@ -5593,7 +5595,7 @@ static void autostart_arrays(int part) | |||
| 5593 | autorun_devices(part); | 5595 | autorun_devices(part); |
| 5594 | } | 5596 | } |
| 5595 | 5597 | ||
| 5596 | #endif | 5598 | #endif /* !MODULE */ |
| 5597 | 5599 | ||
| 5598 | static __exit void md_exit(void) | 5600 | static __exit void md_exit(void) |
| 5599 | { | 5601 | { |
