Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

x86: devicetree: Add missing early_init_dt_setup_initrd_arch stub

This patch fixes the following build failure:

drivers/built-in.o: In function `early_init_dt_check_for_initrd':
/home/florian/dev/kernel/x86/linux-2.6-x86/drivers/of/fdt.c:571:
undefined reference to `early_init_dt_setup_initrd_arch'
make: *** [.tmp_vmlinux1] Error 1

which happens as soon as we enable initrd support on a x86 devicetree
platform such as Intel CE4100.

Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Maxime Bizon <mbizon@freebox.fr>
Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: stable@kernel.org # 2.6.39
Link: http://lkml.kernel.org/r/201106061015.50039.ffainelli@freebox.fr
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

authored by

Florian Fainelli and committed by
Thomas Gleixner
977cb76d fd8a7de1

+11
+11
arch/x86/kernel/devicetree.c
··· 13 13 #include <linux/slab.h> 14 14 #include <linux/pci.h> 15 15 #include <linux/of_pci.h> 16 + #include <linux/initrd.h> 16 17 17 18 #include <asm/hpet.h> 18 19 #include <asm/irq_controller.h> ··· 98 97 { 99 98 return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); 100 99 } 100 + 101 + #ifdef CONFIG_BLK_DEV_INITRD 102 + void __init early_init_dt_setup_initrd_arch(unsigned long start, 103 + unsigned long end) 104 + { 105 + initrd_start = (unsigned long)__va(start); 106 + initrd_end = (unsigned long)__va(end); 107 + initrd_below_start_ok = 1; 108 + } 109 + #endif 101 110 102 111 void __init add_dtb(u64 data) 103 112 {