summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2011-05-02 15:51:32 -0400
committerChris Metcalf <cmetcalf@tilera.com>2011-05-04 14:40:36 -0400
commit43d9ebba93b4e775f89efc1eeeed3075a4ab4741 (patch)
tree2b09b6ccbb1346aa64574cbebfbdc7b3017ef00e
parent229f4df1fb84e5d3306b4fc49b41f7847340092d (diff)
downloadblackbird-op-linux-43d9ebba93b4e775f89efc1eeeed3075a4ab4741.tar.gz
blackbird-op-linux-43d9ebba93b4e775f89efc1eeeed3075a4ab4741.zip
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>
-rw-r--r--arch/tile/kernel/setup.c6
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)
#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)
{
/*
OpenPOWER on IntegriCloud