lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD

Browse Source 
The code accidentally was relying on this configuration option
being selected.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
This commit is contained in:
Chris Metcalf
2011-05-02 15:51:32 -04:00
parent 229f4df1fb
commit 43d9ebba93
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/tile/kernel/setup.c
View File

@@ -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)
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)
{ {
/* /*