---

yaml
---
r: 26067
b: refs/heads/master
c: 1c97b73
h: refs/heads/master
i:
  26065: 9deba38
  26063: 1852b2c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b91ff4f425edb875c8e071d19a2417d23c578a4
+refs/heads/master: 1c97b73e89af9a20e99450c554cffdd9327e827a

trunk/arch/arm/kernel/setup.c

@@ -407,7 +407,7 @@ static void __init early_initrd(char **p)
 }
 __early_param("initrd=", early_initrd);
 
-static void __init add_memory(unsigned long start, unsigned long size)
+static void __init arm_add_memory(unsigned long start, unsigned long size)
 {
 	/*
 	 * Ensure that start/size are aligned to a page boundary.
@@ -445,7 +445,7 @@ static void __init early_mem(char **p)
 	if (**p == '@')
 		start = memparse(*p + 1, p);
 
-	add_memory(start, size);
+	arm_add_memory(start, size);
 }
 __early_param("mem=", early_mem);
 
@@ -587,7 +587,7 @@ static int __init parse_tag_mem32(const struct tag *tag)
 			tag->u.mem.start, tag->u.mem.size / 1024);
 		return -EINVAL;
 	}
-	add_memory(tag->u.mem.start, tag->u.mem.size);
+	arm_add_memory(tag->u.mem.start, tag->u.mem.size);
 	return 0;
 }