commit 43d9ebba93b4e775f89efc1eeeed3075a4ab4741
author Chris Metcalf <cmetcalf@tilera.com> Mon May 02 15:51:32 2011 -0400
committer Chris Metcalf <cmetcalf@tilera.com> Wed May 04 14:40:36 2011 -0400
tree 2b09b6ccbb1346aa64574cbebfbdc7b3017ef00e
parent 229f4df1fb84e5d3306b4fc49b41f7847340092d

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>

arch/tile/kernel/setup.c

diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 3696b18..6cdc9ba 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -912,6 +912,8 @@
 #endif
 }
 
+#ifdef CONFIG_BLK_DEV_INITRD
+
 static int __initdata set_initramfs_file;
 static char __initdata initramfs_file[128] = "initramfs.cpio.gz";
 
@@ -969,6 +971,10 @@
 	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)
 {
 	/*