diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2008-02-06 01:37:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:41:06 -0800 |
| commit | b25b7819e51f388f8c8d7ae4679a658895dc67cc (patch) | |
| tree | 8360bd9d79feab0485177825fc6b5997ab653eba /init | |
| parent | d99c4f6b13b3149bc83703ab1493beaeaaaf8a2d (diff) | |
| download | linux-3.10-b25b7819e51f388f8c8d7ae4679a658895dc67cc.tar.gz linux-3.10-b25b7819e51f388f8c8d7ae4679a658895dc67cc.tar.bz2 linux-3.10-b25b7819e51f388f8c8d7ae4679a658895dc67cc.zip | |
Remove superfluous checks for CONFIG_BLK_DEV_INITRD from initramfs.c
Given that init/Makefile includes initramfs.c in the build only if
CONFIG_BLK_DEV_INITRD is defined, there seems to be no point checking for
it yet again.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/initramfs.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 1db02a0025d..d53fee8d860 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -503,7 +503,6 @@ static int __init retain_initrd_param(char *str) __setup("retain_initrd", retain_initrd_param); extern char __initramfs_start[], __initramfs_end[]; -#ifdef CONFIG_BLK_DEV_INITRD #include <linux/initrd.h> #include <linux/kexec.h> @@ -539,15 +538,12 @@ skip: initrd_end = 0; } -#endif - static int __init populate_rootfs(void) { char *err = unpack_to_rootfs(__initramfs_start, __initramfs_end - __initramfs_start, 0); if (err) panic(err); -#ifdef CONFIG_BLK_DEV_INITRD if (initrd_start) { #ifdef CONFIG_BLK_DEV_RAM int fd; @@ -579,7 +575,6 @@ static int __init populate_rootfs(void) free_initrd(); #endif } -#endif return 0; } rootfs_initcall(populate_rootfs); |