Преглед на файлове

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>
Chris Metcalf преди 14 години
родител
ревизия
43d9ebba93
променени са 1 файла, в които са добавени 6 реда и са изтрити 0 реда
  1. 6 0
      arch/tile/kernel/setup.c

+ 6 - 0
arch/tile/kernel/setup.c

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