From: Chris Metcalf <cmetcalf@tilera.com>
Date: Mon, 2 May 2011 19:51:32 +0000 (-0400)
Subject: arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=43d9ebba93b4e775f89efc1eeeed3075a4ab4741;p=deliverable%2Flinux.git

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>
---

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)
 #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 @@ void __init free_initrd_mem(unsigned long begin, unsigned long end)
 	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)
 {
 	/*