From 7d03401c31bb16a5544b4844dd68af1e5bb105c8 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 1 Oct 2010 14:12:22 +0100
Subject: [PATCH] --- yaml --- r: 212415 b: refs/heads/master c:
 842eab40b6920819fff5caeefdb709f07d3f8e23 h: refs/heads/master i:   212413:
 846a670a7dde10afa345fd0a3c5898fede0c128c   212411:
 ad27a1cecc4a02e92091f5188ef728af3b9588e8   212407:
 7a3dd8ddc6a249da90e9e1e9b234442c289f1260   212399:
 6850f8cfccd3aa9d40ddbbd63725ac7911fccdbb   212383:
 1295e13a149db595eae91594969dcc97f4d196a2   212351:
 522d3db64b55ae6b910e0aa12fe4b77d394e62ef v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/kernel/head-common.S | 2 +-
 trunk/arch/arm/kernel/setup.c       | 2 +-
 trunk/arch/arm/mm/init.c            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2e317c7c2e89..10683118190d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7b0aff44a0740eedd31b759fd08d9e25672fa76
+refs/heads/master: 842eab40b6920819fff5caeefdb709f07d3f8e23
diff --git a/trunk/arch/arm/kernel/head-common.S b/trunk/arch/arm/kernel/head-common.S
index b9505aa267c0..58a3e632b6d5 100644
--- a/trunk/arch/arm/kernel/head-common.S
+++ b/trunk/arch/arm/kernel/head-common.S
@@ -20,7 +20,7 @@
 __switch_data:
 	.long	__mmap_switched
 	.long	__data_loc			@ r4
-	.long	_data				@ r5
+	.long	_sdata				@ r5
 	.long	__bss_start			@ r6
 	.long	_end				@ r7
 	.long	processor_id			@ r4
diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c
index 5a82c39ca85e..f38917174b71 100644
--- a/trunk/arch/arm/kernel/setup.c
+++ b/trunk/arch/arm/kernel/setup.c
@@ -491,7 +491,7 @@ request_standard_resources(struct meminfo *mi, struct machine_desc *mdesc)
 
 	kernel_code.start   = virt_to_phys(_text);
 	kernel_code.end     = virt_to_phys(_etext - 1);
-	kernel_data.start   = virt_to_phys(_data);
+	kernel_data.start   = virt_to_phys(_sdata);
 	kernel_data.end     = virt_to_phys(_end - 1);
 
 	for (i = 0; i < mi->nr_banks; i++) {
diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c
index 7185b00650fe..36c4553ffcce 100644
--- a/trunk/arch/arm/mm/init.c
+++ b/trunk/arch/arm/mm/init.c
@@ -277,7 +277,7 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
 
 	/* Register the kernel text, kernel data and initrd with memblock. */
 #ifdef CONFIG_XIP_KERNEL
-	memblock_reserve(__pa(_data), _end - _data);
+	memblock_reserve(__pa(_sdata), _end - _sdata);
 #else
 	memblock_reserve(__pa(_stext), _end - _stext);
 #endif
@@ -545,7 +545,7 @@ void __init mem_init(void)
 
 			MLK_ROUNDUP(__init_begin, __init_end),
 			MLK_ROUNDUP(_text, _etext),
-			MLK_ROUNDUP(_data, _edata));
+			MLK_ROUNDUP(_sdata, _edata));
 
 #undef MLK
 #undef MLM