| Message ID | 1241135883-9766-5-git-send-email-tabbott@mit.edu (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Paul Mundt |
| Headers | show |
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S index 5f5e190..eabb0bb 100644 --- a/arch/sh/kernel/vmlinux_32.lds.S +++ b/arch/sh/kernel/vmlinux_32.lds.S @@ -64,13 +64,11 @@ SECTIONS *(.data.init_task) . = ALIGN(L1_CACHE_BYTES); - *(.data.cacheline_aligned) - - . = ALIGN(L1_CACHE_BYTES); *(.data.read_mostly) PAGE_ALIGNED_DATA NOSAVE_DATA + CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) DATA_DATA CONSTRUCTORS } diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S index 9cccb3d..e0e2e1b 100644 --- a/arch/sh/kernel/vmlinux_64.lds.S +++ b/arch/sh/kernel/vmlinux_64.lds.S @@ -73,13 +73,11 @@ SECTIONS *(.data.init_task) . = ALIGN(L1_CACHE_BYTES); - *(.data.cacheline_aligned) - - . = ALIGN(L1_CACHE_BYTES); *(.data.read_mostly) PAGE_ALIGNED_DATA NOSAVE_DATA + CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) DATA_DATA CONSTRUCTORS }
I moved the section after NOSAVE_DATA with the intention of having the alignment levels of the sections placed in the .data output section being strictly decreasing. Signed-off-by: Tim Abbott <tabbott@mit.edu> Cc: Paul Mundt <lethal@linux-sh.org> Cc: linux-sh@vger.kernel.org --- arch/sh/kernel/vmlinux_32.lds.S | 4 +--- arch/sh/kernel/vmlinux_64.lds.S | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)