lkml.org 
[lkml]   [2008]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 04/29] m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro
    From: Cyrill Gorcunov <gorcunov@gmail.com>

    This patch includes page.h header into linker script that
    allow us to use PAGE_SIZE macro instead of numeric constant

    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    ---
    arch/m68k/kernel/vmlinux-std.lds | 3 ++-
    arch/m68k/kernel/vmlinux-sun3.lds | 7 ++++---
    2 files changed, 6 insertions(+), 4 deletions(-)

    --- a/arch/m68k/kernel/vmlinux-std.lds
    +++ b/arch/m68k/kernel/vmlinux-std.lds
    @@ -1,6 +1,7 @@
    /* ld script to make m68k Linux kernel */

    #include <asm-generic/vmlinux.lds.h>
    +#include <asm/page.h>

    OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
    OUTPUT_ARCH(m68k)
    @@ -41,7 +42,7 @@ SECTIONS
    _edata = .; /* End of data section */

    /* will be freed after init */
    - . = ALIGN(4096); /* Init code and data */
    + . = ALIGN(PAGE_SIZE); /* Init code and data */
    __init_begin = .;
    .init.text : {
    _sinittext = .;
    --- a/arch/m68k/kernel/vmlinux-sun3.lds
    +++ b/arch/m68k/kernel/vmlinux-sun3.lds
    @@ -1,6 +1,7 @@
    /* ld script to make m68k Linux kernel */

    #include <asm-generic/vmlinux.lds.h>
    +#include <asm/page.h>

    OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
    OUTPUT_ARCH(m68k)
    @@ -34,7 +35,7 @@ SECTIONS
    _edata = .;

    /* will be freed after init */
    - . = ALIGN(8192); /* Init code and data */
    + . = ALIGN(PAGE_SIZE); /* Init code and data */
    __init_begin = .;
    .init.text : {
    _sinittext = .;
    @@ -61,12 +62,12 @@ __init_begin = .;
    }
    SECURITY_INIT
    #ifdef CONFIG_BLK_DEV_INITRD
    - . = ALIGN(8192);
    + . = ALIGN(PAGE_SIZE);
    __initramfs_start = .;
    .init.ramfs : { *(.init.ramfs) }
    __initramfs_end = .;
    #endif
    - . = ALIGN(8192);
    + . = ALIGN(PAGE_SIZE);
    __init_end = .;
    .data.init.task : { *(.data.init_task) }

    --
    Gr{oetje,eeting}s,
    Geert

    --
    Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

    In personal conversations with technical people, I call myself a hacker. But
    when I'm talking to journalists I just say "programmer" or something like that.
    -- Linus Torvalds



    \
     
     \ /
      Last update: 2008-07-17 21:27    [W:0.029 / U:30.328 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site