aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/setup.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-09-06 05:57:03 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-06 05:57:03 -0400
commit012d1f4af1b07e5ccfcd23b7c1dcdcc30a068257 (patch)
treeb054a3cc06cf026160a3e44b51b4ccc167baba4b /arch/arm/kernel/setup.c
parent446616dbb48c7dc039649f796c3fab55c44bd0bc (diff)
[ARM] move initrd code from kernel/setup.c to mm/init.c
This quietens some sparse warnings about phys_initrd_start and phys_initrd_size. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r--arch/arm/kernel/setup.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 67d20e9a7451..f972fc3e979b 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -113,9 +113,6 @@ static struct stack stacks[NR_CPUS];
113char elf_platform[ELF_PLATFORM_SIZE]; 113char elf_platform[ELF_PLATFORM_SIZE];
114EXPORT_SYMBOL(elf_platform); 114EXPORT_SYMBOL(elf_platform);
115 115
116unsigned long phys_initrd_start __initdata = 0;
117unsigned long phys_initrd_size __initdata = 0;
118
119static struct meminfo meminfo __initdata = { 0, }; 116static struct meminfo meminfo __initdata = { 0, };
120static const char *cpu_name; 117static const char *cpu_name;
121static const char *machine_name; 118static const char *machine_name;
@@ -445,20 +442,6 @@ static struct machine_desc * __init setup_machine(unsigned int nr)
445 return list; 442 return list;
446} 443}
447 444
448static void __init early_initrd(char **p)
449{
450 unsigned long start, size;
451
452 start = memparse(*p, p);
453 if (**p == ',') {
454 size = memparse((*p) + 1, p);
455
456 phys_initrd_start = start;
457 phys_initrd_size = size;
458 }
459}
460__early_param("initrd=", early_initrd);
461
462static void __init arm_add_memory(unsigned long start, unsigned long size) 445static void __init arm_add_memory(unsigned long start, unsigned long size)
463{ 446{
464 struct membank *bank; 447 struct membank *bank;
@@ -696,26 +679,6 @@ static int __init parse_tag_ramdisk(const struct tag *tag)
696 679
697__tagtable(ATAG_RAMDISK, parse_tag_ramdisk); 680__tagtable(ATAG_RAMDISK, parse_tag_ramdisk);
698 681
699static int __init parse_tag_initrd(const struct tag *tag)
700{
701 printk(KERN_WARNING "ATAG_INITRD is deprecated; "
702 "please update your bootloader.\n");
703 phys_initrd_start = __virt_to_phys(tag->u.initrd.start);
704 phys_initrd_size = tag->u.initrd.size;
705 return 0;
706}
707
708__tagtable(ATAG_INITRD, parse_tag_initrd);
709
710static int __init parse_tag_initrd2(const struct tag *tag)
711{
712 phys_initrd_start = tag->u.initrd.start;
713 phys_initrd_size = tag->u.initrd.size;
714 return 0;
715}
716
717__tagtable(ATAG_INITRD2, parse_tag_initrd2);
718
719static int __init parse_tag_serialnr(const struct tag *tag) 682static int __init parse_tag_serialnr(const struct tag *tag)
720{ 683{
721 system_serial_low = tag->u.serialnr.low; 684 system_serial_low = tag->u.serialnr.low;