From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 6 Jun 2011 16:12:58 +0000 (+0100)
Subject: fixup! ARM: LPAE: add support for ATAG_MEM64
X-Git-Tag: next-20110726~88^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e51a9f6afd864a7451318503f0fb36b396606cc;p=karo-tx-linux.git

fixup! ARM: LPAE: add support for ATAG_MEM64

Don't rename the tag.u.mem member to mem32 as there are several places
where this is used and have not been updated.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index d6d2efb3ed0e..8423a058fb62 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -154,7 +154,7 @@ struct tag {
 	struct tag_header hdr;
 	union {
 		struct tag_core		core;
-		struct tag_mem32	mem32;
+		struct tag_mem32	mem;
 		struct tag_mem64	mem64;
 		struct tag_videotext	videotext;
 		struct tag_ramdisk	ramdisk;
diff --git a/arch/arm/kernel/compat.c b/arch/arm/kernel/compat.c
index f224d950202d..925652318b8b 100644
--- a/arch/arm/kernel/compat.c
+++ b/arch/arm/kernel/compat.c
@@ -86,8 +86,8 @@ static struct tag * __init memtag(struct tag *tag, unsigned long start, unsigned
 	tag = tag_next(tag);
 	tag->hdr.tag = ATAG_MEM;
 	tag->hdr.size = tag_size(tag_mem32);
-	tag->u.mem32.size = size;
-	tag->u.mem32.start = start;
+	tag->u.mem.size = size;
+	tag->u.mem.start = start;
 
 	return tag;
 }
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 906a6bb8142e..3ae8e6bab960 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -600,7 +600,7 @@ __tagtable(ATAG_CORE, parse_tag_core);
 
 static int __init parse_tag_mem32(const struct tag *tag)
 {
-	return arm_add_memory(tag->u.mem32.start, tag->u.mem32.size);
+	return arm_add_memory(tag->u.mem.start, tag->u.mem.size);
 }
 
 __tagtable(ATAG_MEM, parse_tag_mem32);