diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2014-04-16 15:59:35 +0530 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-04-30 11:39:09 +0530 |
| commit | 9c08267bfe3473c35c8bf3e75241f8c97e1841dd (patch) | |
| tree | 1cf86980ce66bcbf6c370370685e3ded8c9279d0 /drivers/of | |
| parent | b227a6e55ab6d75fa6a60b97f32a406eb183f1a2 (diff) | |
of: remove early_init_dt_setup_initrd_arch
All arches do essentially the same thing now for
early_init_dt_setup_initrd_arch, so it can now be removed.
Conflicts:
arch/arm/mm/init.c
arch/c6x/kernel/devicetree.c
arch/powerpc/kernel/prom.c
(cherry picked from commit 29eb45a9ab4839a1e9cef2bcf369b918c9c4fcad)
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Change-Id: I84b59cec16fa7e96fa8ff3de04aa959f7039a7a9
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/fdt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 9ef99cd21a6c..a6287c6ad6c2 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -551,7 +551,7 @@ int __init of_flat_dt_match(unsigned long node, const char *const *compat) * early_init_dt_check_for_initrd - Decode initrd location from flat tree * @node: reference to node containing initrd location ('chosen') */ -void __init early_init_dt_check_for_initrd(unsigned long node) +static void __init early_init_dt_check_for_initrd(unsigned long node) { u64 start, end; unsigned long len; @@ -569,12 +569,15 @@ void __init early_init_dt_check_for_initrd(unsigned long node) return; end = of_read_number(prop, len/4); - early_init_dt_setup_initrd_arch(start, end); + initrd_start = (unsigned long)__va(start); + initrd_end = (unsigned long)__va(end); + initrd_below_start_ok = 1; + pr_debug("initrd_start=0x%llx initrd_end=0x%llx\n", (unsigned long long)start, (unsigned long long)end); } #else -inline void early_init_dt_check_for_initrd(unsigned long node) +static inline void early_init_dt_check_for_initrd(unsigned long node) { } #endif /* CONFIG_BLK_DEV_INITRD */ |