lkml.org 
[lkml]   [2009]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 1/2] arm: convert to use __HEAD and HEAD_TEXT macros.
    Date
    This has the consequence of changing the section name used for head
    code from ".text.head" to ".head.text". Since this commit changes all
    users in the architecture, this change should be harmless.

    The .text.head output section is eliminated and the head text code is
    included at the start of the .init output section.

    Signed-off-by: Tim Abbott <tabbott@ksplice.com>
    Cc: Russell King <rmk+kernel@arm.linux.org.uk>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Acked-by: Sam Ravnborg <sam@ravnborg.org>
    ---
    arch/arm/kernel/head-nommu.S | 2 +-
    arch/arm/kernel/head.S | 2 +-
    arch/arm/kernel/vmlinux.lds.S | 8 +++-----
    3 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
    index e5dfc28..573b803 100644
    --- a/arch/arm/kernel/head-nommu.S
    +++ b/arch/arm/kernel/head-nommu.S
    @@ -32,7 +32,7 @@
    * numbers for r1.
    *
    */
    - .section ".text.head", "ax"
    + __HEAD
    ENTRY(stext)
    setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode
    @ and irqs disabled
    diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
    index 38ccbe1..eb62bf9 100644
    --- a/arch/arm/kernel/head.S
    +++ b/arch/arm/kernel/head.S
    @@ -74,7 +74,7 @@
    * crap here - that's what the boot loader (or in extreme, well justified
    * circumstances, zImage) is for.
    */
    - .section ".text.head", "ax"
    + __HEAD
    ENTRY(stext)
    setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode
    @ and irqs disabled
    diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
    index aecf87d..0902f80 100644
    --- a/arch/arm/kernel/vmlinux.lds.S
    +++ b/arch/arm/kernel/vmlinux.lds.S
    @@ -24,13 +24,11 @@ SECTIONS
    #else
    . = PAGE_OFFSET + TEXT_OFFSET;
    #endif
    - .text.head : {
    - _stext = .;
    - _sinittext = .;
    - *(.text.head)
    - }

    .init : { /* Init code and data */
    + _stext = .;
    + _sinittext = .;
    + HEAD_TEXT
    INIT_TEXT
    _einittext = .;
    __proc_info_begin = .;
    --
    1.6.4.3


    \
     
     \ /
      Last update: 2009-10-02 22:35    [W:0.027 / U:120.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site