Messages in this thread Patch in this message | | | From | Tim Abbott <> | Subject | [PATCH 07/11] x86: use new macro for .data.cacheline_aligned section. | Date | Thu, 30 Apr 2009 20:01:34 -0400 |
| |
.data.cacheline_aligned should not need a separate output section; this change moves it into the .data section.
This removes the extra ALIGN(PAGE_SIZE) before the cache-aligned data on x86_32, since I don't see a purpose for it.
Signed-off-by: Tim Abbott <tabbott@mit.edu> Cc: Ingo Molnar <mingo@redhat.com> --- arch/x86/kernel/vmlinux.lds.S | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 88b059b..c7d54bf 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -104,6 +104,11 @@ SECTIONS .data : AT(ADDR(.data) - LOAD_OFFSET) { PAGE_ALIGNED_DATA NOSAVE_DATA +#ifdef CONFIG_X86_32 + CACHELINE_ALIGNED_DATA(32) +#else + CACHELINE_ALIGNED_DATA(CONFIG_X86_L1_CACHE_BYTES) +#endif DATA_DATA CONSTRUCTORS @@ -113,17 +118,6 @@ SECTIONS #endif } :data -#ifdef CONFIG_X86_32 - . = ALIGN(32); -#else - . = ALIGN(PAGE_SIZE); - . = ALIGN(CONFIG_X86_L1_CACHE_BYTES); -#endif - .data.cacheline_aligned : - AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { - *(.data.cacheline_aligned) - } - /* rarely changed data like cpu maps */ #ifdef CONFIG_X86_32 . = ALIGN(32); -- 1.6.2.1
| |