Commit 43d9ebba authored by Chris Metcalf's avatar Chris Metcalf

arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD

The code accidentally was relying on this configuration option
being selected.
Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent 229f4df1
...@@ -912,6 +912,8 @@ void __cpuinit setup_cpu(int boot) ...@@ -912,6 +912,8 @@ void __cpuinit setup_cpu(int boot)
#endif #endif
} }
#ifdef CONFIG_BLK_DEV_INITRD
static int __initdata set_initramfs_file; static int __initdata set_initramfs_file;
static char __initdata initramfs_file[128] = "initramfs.cpio.gz"; static char __initdata initramfs_file[128] = "initramfs.cpio.gz";
...@@ -969,6 +971,10 @@ void __init free_initrd_mem(unsigned long begin, unsigned long end) ...@@ -969,6 +971,10 @@ void __init free_initrd_mem(unsigned long begin, unsigned long end)
free_bootmem(__pa(begin), end - begin); free_bootmem(__pa(begin), end - begin);
} }
#else
static inline void load_hv_initrd(void) {}
#endif /* CONFIG_BLK_DEV_INITRD */
static void __init validate_hv(void) static void __init validate_hv(void)
{ {
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment