From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756933Ab1FIIJA (ORCPT ); Thu, 9 Jun 2011 04:09:00 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:58791 "EHLO smtp4-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755089Ab1FIIIw (ORCPT ); Thu, 9 Jun 2011 04:08:52 -0400 From: Florian Fainelli Organization: Freebox To: Grant Likely Subject: Re: [PATCH] x86/devicetree: add missing early_init_dt_setup_initrd_arch stub Date: Thu, 9 Jun 2011 10:13:02 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.38-8-server; KDE/4.6.2; x86_64; ; ) Cc: Sebastian Andrzej Siewior , tglx@linutronix.de, linux-kernel@vger.kernel.org, Ingo Molnar , Maxime Bizon References: <201106061015.50039.ffainelli@freebox.fr> <20110606082131.GH10410@ponder.secretlab.ca> In-Reply-To: <20110606082131.GH10410@ponder.secretlab.ca> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201106091013.02218.ffainelli@freebox.fr> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 06 June 2011 10:21:31 Grant Likely wrote: > On Mon, Jun 06, 2011 at 10:15:49AM +0200, Florian Fainelli wrote: > > From: Florian Fainelli > > > > 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. > > > > Tested on a custom Intel CE4100 board. > > > > CC:stable@kernel.org > > Signed-off-by: Florian Fainelli > > Acked-by: Grant Likely Grant, are you picking this patch to any of your tree? > > > --- > > Grant, > > > > MIPS, PowerPC, Microblaze and now x86 all have the same way of > > implementing this, would it rather make sense to get this merged to > > generic devicetree functions and let this be overriden if needed? > > Probably, but I'm not going to tackle that problem just yet. Although > if you want to investigate and propose a patch, then go for it. :-) Allright, I will take a look at this. > > g. > > > Stable: this is a candidate for 2.6.39.2 > > > > diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c > > index 690bc84..9aeb78a 100644 > > --- a/arch/x86/kernel/devicetree.c > > +++ b/arch/x86/kernel/devicetree.c > > @@ -13,6 +13,7 @@ > > > > #include > > #include > > #include > > > > +#include > > > > #include > > #include > > > > @@ -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)); > > > > } > > > > +#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) > > { > > > > initial_dtb = data + offsetof(struct setup_data, data); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/