projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
229f4df
)
arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD
author
Chris Metcalf
<cmetcalf@tilera.com>
Mon, 2 May 2011 19:51:32 +0000
(15:51 -0400)
committer
Chris Metcalf
<cmetcalf@tilera.com>
Wed, 4 May 2011 18:40:36 +0000
(14:40 -0400)
The code accidentally was relying on this configuration option
being selected.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
arch/tile/kernel/setup.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/tile/kernel/setup.c
b/arch/tile/kernel/setup.c
index 3696b18325665784156689aac1325e725a200b74..6cdc9ba55fe0443dd8906fd60056d1ad9e6e783f 100644
(file)
--- 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)
{
/*