diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-02 15:51:32 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-04 14:40:36 -0400 |
commit | 43d9ebba93b4e775f89efc1eeeed3075a4ab4741 (patch) | |
tree | 2b09b6ccbb1346aa64574cbebfbdc7b3017ef00e /arch/tile/kernel | |
parent | 229f4df1fb84e5d3306b4fc49b41f7847340092d (diff) |
arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD
The code accidentally was relying on this configuration option
being selected.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel')
-rw-r--r-- | arch/tile/kernel/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c index 3696b1832566..6cdc9ba55fe0 100644 --- a/arch/tile/kernel/setup.c +++ b/arch/tile/kernel/setup.c | |||
@@ -912,6 +912,8 @@ void __cpuinit setup_cpu(int boot) | |||
912 | #endif | 912 | #endif |
913 | } | 913 | } |
914 | 914 | ||
915 | #ifdef CONFIG_BLK_DEV_INITRD | ||
916 | |||
915 | static int __initdata set_initramfs_file; | 917 | static int __initdata set_initramfs_file; |
916 | static char __initdata initramfs_file[128] = "initramfs.cpio.gz"; | 918 | static char __initdata initramfs_file[128] = "initramfs.cpio.gz"; |
917 | 919 | ||
@@ -969,6 +971,10 @@ void __init free_initrd_mem(unsigned long begin, unsigned long end) | |||
969 | free_bootmem(__pa(begin), end - begin); | 971 | free_bootmem(__pa(begin), end - begin); |
970 | } | 972 | } |
971 | 973 | ||
974 | #else | ||
975 | static inline void load_hv_initrd(void) {} | ||
976 | #endif /* CONFIG_BLK_DEV_INITRD */ | ||
977 | |||
972 | static void __init validate_hv(void) | 978 | static void __init validate_hv(void) |
973 | { | 979 | { |
974 | /* | 980 | /* |