diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-12-01 07:20:40 -0500 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-12-07 12:22:24 -0500 |
commit | 98fb754831e1d139f1151e968bdebb6eefb9b581 (patch) | |
tree | 457c9fdeb4f59e18c8a64535f30ff9f198de3156 /arch/arm64 | |
parent | 527e9316f8ec44bd53d90fb9f611fa7ffff52bb9 (diff) |
arm64: update linker script to increased L1_CACHE_BYTES value
Bring the linker script in line with the recent increase of
L1_CACHE_BYTES to 128. Replace the hardcoded value of 64 with the
symbolic constant.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
[catalin.marinas@arm.com: fix up RW_DATA_SECTION as well]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/kernel/vmlinux.lds.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 1ee2c3937d4e..71426a78db12 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S | |||
@@ -5,6 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <asm-generic/vmlinux.lds.h> | 7 | #include <asm-generic/vmlinux.lds.h> |
8 | #include <asm/cache.h> | ||
8 | #include <asm/kernel-pgtable.h> | 9 | #include <asm/kernel-pgtable.h> |
9 | #include <asm/thread_info.h> | 10 | #include <asm/thread_info.h> |
10 | #include <asm/memory.h> | 11 | #include <asm/memory.h> |
@@ -140,7 +141,7 @@ SECTIONS | |||
140 | ARM_EXIT_KEEP(EXIT_DATA) | 141 | ARM_EXIT_KEEP(EXIT_DATA) |
141 | } | 142 | } |
142 | 143 | ||
143 | PERCPU_SECTION(64) | 144 | PERCPU_SECTION(L1_CACHE_BYTES) |
144 | 145 | ||
145 | . = ALIGN(PAGE_SIZE); | 146 | . = ALIGN(PAGE_SIZE); |
146 | __init_end = .; | 147 | __init_end = .; |
@@ -158,7 +159,7 @@ SECTIONS | |||
158 | . = ALIGN(PAGE_SIZE); | 159 | . = ALIGN(PAGE_SIZE); |
159 | _data = .; | 160 | _data = .; |
160 | _sdata = .; | 161 | _sdata = .; |
161 | RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE) | 162 | RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) |
162 | PECOFF_EDATA_PADDING | 163 | PECOFF_EDATA_PADDING |
163 | _edata = .; | 164 | _edata = .; |
164 | 165 | ||