ARM: vmlinux.lds: Refer to start of .data using _sdata rather than _data

Use _sdata as the start of the data section, rather than _data.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index b9505aa267c003a84b2101b1e66af809932f867e..58a3e632b6d5bf76e02bb74fbbb4f386f076c9f9 100644 (file)
--- a/arch/arm/kernel/head-common.S
+++ b/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/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 5a82c39ca85eb603fbc47e8d0d9392e42d5ff50a..f38917174b71c29eac054dd38ae0ff8d46e6ea12 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/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/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 7185b00650fe419d0fa0f43b3e79e2e0d90cf6e6..36c4553ffcceaaf787eab4cf90a8368a74b1a789 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/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