Commit 842eab40 authored by Russell King's avatar Russell King

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c7b0aff4
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
__switch_data: __switch_data:
.long __mmap_switched .long __mmap_switched
.long __data_loc @ r4 .long __data_loc @ r4
.long _data @ r5 .long _sdata @ r5
.long __bss_start @ r6 .long __bss_start @ r6
.long _end @ r7 .long _end @ r7
.long processor_id @ r4 .long processor_id @ r4
......
...@@ -491,7 +491,7 @@ request_standard_resources(struct meminfo *mi, struct machine_desc *mdesc) ...@@ -491,7 +491,7 @@ request_standard_resources(struct meminfo *mi, struct machine_desc *mdesc)
kernel_code.start = virt_to_phys(_text); kernel_code.start = virt_to_phys(_text);
kernel_code.end = virt_to_phys(_etext - 1); 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); kernel_data.end = virt_to_phys(_end - 1);
for (i = 0; i < mi->nr_banks; i++) { for (i = 0; i < mi->nr_banks; i++) {
......
...@@ -277,7 +277,7 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) ...@@ -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. */ /* Register the kernel text, kernel data and initrd with memblock. */
#ifdef CONFIG_XIP_KERNEL #ifdef CONFIG_XIP_KERNEL
memblock_reserve(__pa(_data), _end - _data); memblock_reserve(__pa(_sdata), _end - _sdata);
#else #else
memblock_reserve(__pa(_stext), _end - _stext); memblock_reserve(__pa(_stext), _end - _stext);
#endif #endif
...@@ -545,7 +545,7 @@ void __init mem_init(void) ...@@ -545,7 +545,7 @@ void __init mem_init(void)
MLK_ROUNDUP(__init_begin, __init_end), MLK_ROUNDUP(__init_begin, __init_end),
MLK_ROUNDUP(_text, _etext), MLK_ROUNDUP(_text, _etext),
MLK_ROUNDUP(_data, _edata)); MLK_ROUNDUP(_sdata, _edata));
#undef MLK #undef MLK
#undef MLM #undef MLM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment