mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Florian Fainelli <ffainelli@freebox.fr>
To: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: tglx@linutronix.de, Grant Likely <grant.likely@secretlab.ca>,
	linux-kernel@vger.kernel.org, Ingo Molnar <mingo@elte.hu>,
	Maxime Bizon <mbizon@freebox.fr>
Subject: [PATCH] x86/devicetree: add missing early_init_dt_setup_initrd_arch stub
Date: Mon, 6 Jun 2011 10:15:49 +0200	[thread overview]
Message-ID: <201106061015.50039.ffainelli@freebox.fr> (raw)

From: Florian Fainelli <ffainelli@freebox.fr>

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 <ffainelli@freebox.fr>
---
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?

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 <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/of_pci.h>
+#include <linux/initrd.h>
 
 #include <asm/hpet.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));
 }
 
+#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);
-- 
1.7.4.1


             reply	other threads:[~2011-06-06  8:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-06  8:15 Florian Fainelli [this message]
2011-06-06  8:21 ` Grant Likely
2011-06-09  8:13   ` Florian Fainelli
2011-06-09 13:23     ` Grant Likely
2011-06-09 13:43 ` [tip:x86/urgent] x86: devicetree: Add " tip-bot for Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201106061015.50039.ffainelli@freebox.fr \
    --to=ffainelli@freebox.fr \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mbizon@freebox.fr \
    --cc=mingo@elte.hu \
    --cc=sebastian@breakpoint.cc \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®