Commit f0d5375e authored by Will Deacon's avatar Will Deacon Committed by Russell King

ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes

The linker script assumes a cacheline size of 32 bytes when aligning
the .data..cacheline_aligned and .data..percpu sections.

This patch updates the script to use L1_CACHE_BYTES, which should be set
to 64 on platforms that require it.
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 06e99051
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*/ */
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#include <asm/cache.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/page.h> #include <asm/page.h>
...@@ -181,7 +182,7 @@ SECTIONS ...@@ -181,7 +182,7 @@ SECTIONS
} }
#endif #endif
PERCPU_SECTION(32) PERCPU_SECTION(L1_CACHE_BYTES)
#ifdef CONFIG_XIP_KERNEL #ifdef CONFIG_XIP_KERNEL
__data_loc = ALIGN(4); /* location in binary */ __data_loc = ALIGN(4); /* location in binary */
...@@ -212,8 +213,8 @@ SECTIONS ...@@ -212,8 +213,8 @@ SECTIONS
#endif #endif
NOSAVE_DATA NOSAVE_DATA
CACHELINE_ALIGNED_DATA(32) CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
READ_MOSTLY_DATA(32) READ_MOSTLY_DATA(L1_CACHE_BYTES)
/* /*
* The exception fixup table (might need resorting at runtime) * The exception fixup table (might need resorting at runtime)
......
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