Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 977cb76d authored by Florian Fainelli's avatar Florian Fainelli Committed by Thomas Gleixner
Browse files

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: default avatarFlorian Fainelli <ffainelli@freebox.fr>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Cc: Maxime Bizon <mbizon@freebox.fr>
Acked-by: default avatarSebastian 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent fd8a7de1

arch/x86/kernel/devicetree.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/of_pci.h>

#include <linux/of_pci.h>

#include <linux/initrd.h>





#include <asm/hpet.h>

#include <asm/hpet.h>

#include <asm/irq_controller.h>

#include <asm/irq_controller.h>
@@ -98,6 +99,16 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) 
	return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));

	return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));

}

}





#ifdef CONFIG_BLK_DEV_INITRD

void __init early_init_dt_setup_initrd_arch(unsigned long start,

					    unsigned long end)

{

	initrd_start = (unsigned long)__va(start);

	initrd_end = (unsigned long)__va(end);

	initrd_below_start_ok = 1;

}

#endif



void __init add_dtb(u64 data)

void __init add_dtb(u64 data)

{

{

	initial_dtb = data + offsetof(struct setup_data, data);

	initial_dtb = data + offsetof(struct setup_data, data);