lkml.org 
[lkml]   [2009]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/kbuild] x86, vmlinux.lds: unify PHDRS
    Commit-ID:  afb8095a7eab32e5760613fa73d2f80a39cc45bf
    Gitweb: http://git.kernel.org/tip/afb8095a7eab32e5760613fa73d2f80a39cc45bf
    Author: Sam Ravnborg <sam@ravnborg.org>
    AuthorDate: Wed, 29 Apr 2009 09:47:19 +0200
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 29 Apr 2009 10:20:30 +0200

    x86, vmlinux.lds: unify PHDRS

    PHDRS are not equal for the two - so
    use ifdefs to cover up for that.

    On the assumption that they may become equal the ifdef
    is inside the PHDRS definiton.

    [ Impact: cleanup ]

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Tim Abbott <tabbott@MIT.EDU>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    LKML-Reference: <1240991249-27117-3-git-send-email-sam@ravnborg.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>


    ---
    arch/x86/kernel/vmlinux.lds.S | 13 +++++++++++++
    arch/x86/kernel/vmlinux_32.lds.S | 5 -----
    arch/x86/kernel/vmlinux_64.lds.S | 11 -----------
    3 files changed, 13 insertions(+), 16 deletions(-)

    diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
    index d113642..1a1b303 100644
    --- a/arch/x86/kernel/vmlinux.lds.S
    +++ b/arch/x86/kernel/vmlinux.lds.S
    @@ -40,6 +40,19 @@ ENTRY(phys_startup_64)
    jiffies_64 = jiffies;
    #endif

    +PHDRS {
    + text PT_LOAD FLAGS(5); /* R_E */
    + data PT_LOAD FLAGS(7); /* RWE */
    +#ifdef CONFIG_X86_64
    + user PT_LOAD FLAGS(7); /* RWE */
    + data.init PT_LOAD FLAGS(7); /* RWE */
    +#ifdef CONFIG_SMP
    + percpu PT_LOAD FLAGS(7); /* RWE */
    +#endif
    + data.init2 PT_LOAD FLAGS(7); /* RWE */
    +#endif
    + note PT_NOTE FLAGS(0); /* ___ */
    +}

    #ifdef CONFIG_X86_32
    # include "vmlinux_32.lds.S"
    diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
    index 4c985fc..4fd40dc 100644
    --- a/arch/x86/kernel/vmlinux_32.lds.S
    +++ b/arch/x86/kernel/vmlinux_32.lds.S
    @@ -1,8 +1,3 @@
    -PHDRS {
    - text PT_LOAD FLAGS(5); /* R_E */
    - data PT_LOAD FLAGS(7); /* RWE */
    - note PT_NOTE FLAGS(0); /* ___ */
    -}
    SECTIONS
    {
    . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
    diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
    index 7f1cc3d..6e7cbee 100644
    --- a/arch/x86/kernel/vmlinux_64.lds.S
    +++ b/arch/x86/kernel/vmlinux_64.lds.S
    @@ -1,14 +1,3 @@
    -PHDRS {
    - text PT_LOAD FLAGS(5); /* R_E */
    - data PT_LOAD FLAGS(7); /* RWE */
    - user PT_LOAD FLAGS(7); /* RWE */
    - data.init PT_LOAD FLAGS(7); /* RWE */
    -#ifdef CONFIG_SMP
    - percpu PT_LOAD FLAGS(7); /* RWE */
    -#endif
    - data.init2 PT_LOAD FLAGS(7); /* RWE */
    - note PT_NOTE FLAGS(0); /* ___ */
    -}
    SECTIONS
    {
    . = __START_KERNEL;

    \
     
     \ /
      Last update: 2009-04-29 11:09    [W:0.030 / U:31.540 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site