Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/kernel/head-common.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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++) {

arch/arm/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -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