arm64: use generic RW_DATA_SECTION macro in linker script

The .data section in the arm64 linker script currently lacks a
definition for page-aligned data. This leads to a .page_aligned
section being placed between the end of data and start of bss.
This patch corrects that by using the generic RW_DATA_SECTION
macro which includes support for page-aligned data.

Signed-off-by: Mark Salter <msalter@redhat.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Mark Salter 2013-11-04 16:38:47 +00:00 committed by Catalin Marinas
parent 264666e628
commit 3c620626c0
1 changed files with 6 additions and 23 deletions

View File

@ -96,30 +96,13 @@ SECTIONS
PERCPU_SECTION(64) PERCPU_SECTION(64)
__init_end = .; __init_end = .;
. = ALIGN(THREAD_SIZE);
__data_loc = .;
.data : AT(__data_loc) { . = ALIGN(PAGE_SIZE);
_data = .; /* address in memory */ _data = .;
__data_loc = _data - LOAD_OFFSET;
_sdata = .; _sdata = .;
RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)
/*
* first, the init task union, aligned
* to an 8192 byte boundary.
*/
INIT_TASK_DATA(THREAD_SIZE)
NOSAVE_DATA
CACHELINE_ALIGNED_DATA(64)
READ_MOSTLY_DATA(64)
/*
* and the usual data section
*/
DATA_DATA
CONSTRUCTORS
_edata = .; _edata = .;
}
_edata_loc = __data_loc + SIZEOF(.data); _edata_loc = __data_loc + SIZEOF(.data);
BSS_SECTION(0, 0, 0) BSS_SECTION(0, 0, 0)