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 .exit.* and .init.ramfs
    Commit-ID:  bf6a57418d5445c98047edbec022c9e54d1526e6
    Gitweb: http://git.kernel.org/tip/bf6a57418d5445c98047edbec022c9e54d1526e6
    Author: Sam Ravnborg <sam@ravnborg.org>
    AuthorDate: Wed, 29 Apr 2009 09:47:27 +0200
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 29 Apr 2009 10:20:34 +0200

    x86, vmlinux.lds: unify .exit.* and .init.ramfs

    [ 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-11-git-send-email-sam@ravnborg.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>


    ---
    arch/x86/kernel/vmlinux.lds.S | 20 ++++++++++++++++++++
    arch/x86/kernel/vmlinux_32.lds.S | 21 ---------------------
    arch/x86/kernel/vmlinux_64.lds.S | 21 ---------------------
    3 files changed, 20 insertions(+), 42 deletions(-)

    diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
    index c8dd71e..1ab62a5 100644
    --- a/arch/x86/kernel/vmlinux.lds.S
    +++ b/arch/x86/kernel/vmlinux.lds.S
    @@ -309,6 +309,26 @@ SECTIONS
    *(.altinstr_replacement)
    }

    + /*
    + * .exit.text is discard at runtime, not link time, to deal with
    + * references from .altinstructions and .eh_frame
    + */
    + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
    + EXIT_TEXT
    + }
    +
    + .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
    + EXIT_DATA
    + }
    +
    +#ifdef CONFIG_BLK_DEV_INITRD
    + . = ALIGN(PAGE_SIZE);
    + .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
    + __initramfs_start = .;
    + *(.init.ramfs)
    + __initramfs_end = .;
    + }
    +#endif

    #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 5df9647..36c8fbd 100644
    --- a/arch/x86/kernel/vmlinux_32.lds.S
    +++ b/arch/x86/kernel/vmlinux_32.lds.S
    @@ -1,24 +1,3 @@
    - /*
    - * .exit.text is discard at runtime, not link time, to deal with
    - * references from .altinstructions and .eh_frame
    - */
    - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
    - EXIT_TEXT
    - }
    -
    - .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
    - EXIT_DATA
    - }
    -
    -#if defined(CONFIG_BLK_DEV_INITRD)
    - . = ALIGN(PAGE_SIZE);
    - .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
    - __initramfs_start = .;
    - *(.init.ramfs)
    - __initramfs_end = .;
    - }
    -#endif
    -
    PERCPU(PAGE_SIZE)

    . = ALIGN(PAGE_SIZE);
    diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
    index 9ef7096..1aa5362 100644
    --- a/arch/x86/kernel/vmlinux_64.lds.S
    +++ b/arch/x86/kernel/vmlinux_64.lds.S
    @@ -1,24 +1,3 @@
    - /*
    - * .exit.text is discard at runtime, not link time, to deal with
    - * references from .altinstructions and .eh_frame
    - */
    - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
    - EXIT_TEXT
    - }
    -
    - .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
    - EXIT_DATA
    - }
    -
    -#ifdef CONFIG_BLK_DEV_INITRD
    - . = ALIGN(PAGE_SIZE);
    - .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
    - __initramfs_start = .;
    - *(.init.ramfs)
    - __initramfs_end = .;
    - }
    -#endif
    -
    #ifdef CONFIG_SMP
    /*
    * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the

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