aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/kernel
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-08-30 18:06:53 -0400
committerRob Herring <rob.herring@calxeda.com>2013-10-09 12:39:01 -0400
commit29eb45a9ab4839a1e9cef2bcf369b918c9c4fcad (patch)
tree00893156dab39f9e739ab9055dd163a2a547d721 /arch/xtensa/kernel
parentec2eaa73b3d21776f46797a2eef983d7be09a964 (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. Signed-off-by: Rob Herring <rob.herring@calxeda.com> 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>
Diffstat (limited to 'arch/xtensa/kernel')
-rw-r--r--arch/xtensa/kernel/setup.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 65974a8f41a4..6e2b6638122d 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -61,8 +61,8 @@ extern struct rtc_ops no_rtc_ops;
61struct rtc_ops *rtc_ops; 61struct rtc_ops *rtc_ops;
62 62
63#ifdef CONFIG_BLK_DEV_INITRD 63#ifdef CONFIG_BLK_DEV_INITRD
64extern void *initrd_start; 64extern unsigned long initrd_start;
65extern void *initrd_end; 65extern unsigned long initrd_end;
66int initrd_is_mapped = 0; 66int initrd_is_mapped = 0;
67extern int initrd_below_start_ok; 67extern int initrd_below_start_ok;
68#endif 68#endif
@@ -149,8 +149,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)
149{ 149{
150 meminfo_t* mi; 150 meminfo_t* mi;
151 mi = (meminfo_t*)(tag->data); 151 mi = (meminfo_t*)(tag->data);
152 initrd_start = __va(mi->start); 152 initrd_start = (unsigned long)__va(mi->start);
153 initrd_end = __va(mi->end); 153 initrd_end = (unsigned long)__va(mi->end);
154 154
155 return 0; 155 return 0;
156} 156}
@@ -167,13 +167,6 @@ static int __init parse_tag_fdt(const bp_tag_t *tag)
167 167
168__tagtable(BP_TAG_FDT, parse_tag_fdt); 168__tagtable(BP_TAG_FDT, parse_tag_fdt);
169 169
170void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
171{
172 initrd_start = (void *)__va(start);
173 initrd_end = (void *)__va(end);
174 initrd_below_start_ok = 1;
175}
176
177#endif /* CONFIG_OF */ 170#endif /* CONFIG_OF */
178 171
179#endif /* CONFIG_BLK_DEV_INITRD */ 172#endif /* CONFIG_BLK_DEV_INITRD */