Messages in this thread Patch in this message | | | From | Tim Abbott <> | Subject | [PATCH 03/11] x86: Use macros for .data.page_aligned. | Date | Thu, 30 Apr 2009 20:01:30 -0400 |
| |
.data.page_aligned should not need a separate output section. So, as part of this cleanup I moved it into the .data output section in the linker scripts in order to eliminate unnecessary references to the section name.
Signed-off-by: Tim Abbott <tabbott@mit.edu> Cc: Ingo Molnar <mingo@redhat.com> --- arch/x86/kernel/head_32.S | 2 +- arch/x86/kernel/vmlinux.lds.S | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index a420002..d251f71 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -629,7 +629,7 @@ ENTRY(empty_zero_page) * This starts the data section. */ #ifdef CONFIG_X86_PAE -.section ".data.page_aligned","wa" +__PAGE_ALIGNED_DATA /* Page-aligned for the benefit of paravirt? */ .align PAGE_SIZE_asm ENTRY(swapper_pg_dir) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 037df73..6f73355 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -108,6 +108,7 @@ SECTIONS /* Data */ . = ALIGN(PAGE_SIZE); .data : AT(ADDR(.data) - LOAD_OFFSET) { + PAGE_ALIGNED_DATA DATA_DATA CONSTRUCTORS @@ -128,11 +129,6 @@ SECTIONS } #endif - . = ALIGN(PAGE_SIZE); - .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { - *(.data.page_aligned) - } - #ifdef CONFIG_X86_32 . = ALIGN(32); #else -- 1.6.2.1
| |