lkml.org 
[lkml]   [2009]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/14] x86: Use macros for .data.page_aligned.
    Date
    .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_32.lds.S | 6 +-----
    arch/x86/kernel/vmlinux_64.lds.S | 6 +-----
    3 files changed, 3 insertions(+), 11 deletions(-)

    diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
    index 9694aee..ad0510d 100644
    --- a/arch/x86/kernel/head_32.S
    +++ b/arch/x86/kernel/head_32.S
    @@ -636,7 +636,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_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
    index a57d39c..b458ab4 100644
    --- a/arch/x86/kernel/vmlinux_32.lds.S
    +++ b/arch/x86/kernel/vmlinux_32.lds.S
    @@ -61,6 +61,7 @@ SECTIONS
    /* writeable */
    . = ALIGN(PAGE_SIZE);
    .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */
    + PAGE_ALIGNED_DATA
    DATA_DATA
    CONSTRUCTORS
    } :data
    @@ -73,11 +74,6 @@ SECTIONS
    __nosave_end = .;
    }

    - . = ALIGN(PAGE_SIZE);
    - .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
    - *(.data.page_aligned)
    - }
    -
    . = ALIGN(32);
    .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
    *(.data.cacheline_aligned)
    diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
    index 9b52841..056db9a 100644
    --- a/arch/x86/kernel/vmlinux_64.lds.S
    +++ b/arch/x86/kernel/vmlinux_64.lds.S
    @@ -64,6 +64,7 @@ SECTIONS
    . = ALIGN(PAGE_SIZE);
    /* Data */
    .data : AT(ADDR(.data) - LOAD_OFFSET) {
    + PAGE_ALIGNED_DATA
    DATA_DATA
    CONSTRUCTORS
    /* End of data section */
    @@ -157,11 +158,6 @@ SECTIONS
    *(.data.init_task)
    } :data.init

    - .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
    - . = ALIGN(PAGE_SIZE);
    - *(.data.page_aligned)
    - }
    -
    .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
    /* might get freed after init */
    . = ALIGN(PAGE_SIZE);
    --
    1.6.2.1


    \
     
     \ /
      Last update: 2009-04-27 22:39    [W:0.029 / U:0.440 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site