lkml.org 
[lkml]   [2009]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/5] parisc: use new macros for .data.init_task.
    Date
    .data.init_task should not need a separate output section; this change
    moves it into the .data section.

    Signed-off-by: Tim Abbott <tabbott@mit.edu>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Cc: Helge Deller <deller@gmx.de>
    Cc: linux-parisc@vger.kernel.org
    ---
    arch/parisc/kernel/init_task.c | 2 +-
    arch/parisc/kernel/vmlinux.lds.S | 10 ++--------
    2 files changed, 3 insertions(+), 9 deletions(-)

    diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c
    index 1e25a45..8ee17ea 100644
    --- a/arch/parisc/kernel/init_task.c
    +++ b/arch/parisc/kernel/init_task.c
    @@ -48,7 +48,7 @@ EXPORT_SYMBOL(init_mm);
    * "init_task" linker map entry..
    */
    union thread_union init_thread_union
    - __attribute__((aligned(128))) __attribute__((__section__(".data.init_task"))) =
    + __attribute__((aligned(128))) __init_task_data =
    { INIT_THREAD_INFO(init_task) };

    #if PT_NLEVELS == 3
    diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
    index b5936c9..c8a528d 100644
    --- a/arch/parisc/kernel/vmlinux.lds.S
    +++ b/arch/parisc/kernel/vmlinux.lds.S
    @@ -103,6 +103,8 @@ SECTIONS
    . = ALIGN(L1_CACHE_BYTES);
    /* Data */
    .data : {
    + /* assembler code expects init_task to be 16k aligned */
    + INIT_TASK_DATA(16384)
    NOSAVE_DATA
    CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
    DATA_DATA
    @@ -133,14 +135,6 @@ SECTIONS
    }
    __bss_stop = .;

    -
    - /* assembler code expects init_task to be 16k aligned */
    - . = ALIGN(16384);
    - /* init_task */
    - .data.init_task : {
    - *(.data.init_task)
    - }
    -
    #ifdef CONFIG_64BIT
    . = ALIGN(16);
    /* Linkage tables */
    --
    1.6.2.1


    \
     
     \ /
      Last update: 2009-05-01 02:09    [W:0.065 / U:0.212 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site