lkml.org 
[lkml]   [2009]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/urgent] Revert "x86: linker script syntax nits"
    Commit-ID:  db8590f5043f3436a65b24155a3a7af2604df876
    Gitweb: http://git.kernel.org/tip/db8590f5043f3436a65b24155a3a7af2604df876
    Author: Ingo Molnar <mingo@elte.hu>
    AuthorDate: Thu, 15 Oct 2009 08:08:12 +0200
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Thu, 15 Oct 2009 08:09:55 +0200

    Revert "x86: linker script syntax nits"

    This reverts commit e9a63a4e559fbdc522072281d05e6b13c1022f4b.

    This breaks older binutils, where sink-less asserts are broken.

    See this commit for further details:

    d2ba8b2: x86: Fix assert syntax in vmlinux.lds.S

    Acked-by: "H. Peter Anvin" <hpa@zytor.com>
    Acked-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    LKML-Reference: <4AD6523D.5030909@zytor.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/acpi/realmode/wakeup.lds.S | 4 ++--
    arch/x86/kernel/vmlinux.lds.S | 17 +++++++++--------
    2 files changed, 11 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/kernel/acpi/realmode/wakeup.lds.S b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
    index 0e50e1e..7da00b7 100644
    --- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S
    +++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
    @@ -56,6 +56,6 @@ SECTIONS
    /DISCARD/ : {
    *(.note*)
    }
    -}

    -ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
    + . = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
    +}
    diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
    index 8d6001a..92929fb 100644
    --- a/arch/x86/kernel/vmlinux.lds.S
    +++ b/arch/x86/kernel/vmlinux.lds.S
    @@ -305,8 +305,8 @@ SECTIONS


    #ifdef CONFIG_X86_32
    -ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),
    - "kernel image bigger than KERNEL_IMAGE_SIZE");
    +. = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),
    + "kernel image bigger than KERNEL_IMAGE_SIZE");
    #else
    /*
    * Per-cpu symbols which need to be offset from __per_cpu_load
    @@ -319,12 +319,12 @@ INIT_PER_CPU(irq_stack_union);
    /*
    * Build-time check on the image size:
    */
    -ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
    - "kernel image bigger than KERNEL_IMAGE_SIZE");
    +. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
    + "kernel image bigger than KERNEL_IMAGE_SIZE");

    #ifdef CONFIG_SMP
    -ASSERT((per_cpu__irq_stack_union == 0),
    - "irq_stack_union is not at start of per-cpu area");
    +. = ASSERT((per_cpu__irq_stack_union == 0),
    + "irq_stack_union is not at start of per-cpu area");
    #endif

    #endif /* CONFIG_X86_32 */
    @@ -332,6 +332,7 @@ ASSERT((per_cpu__irq_stack_union == 0),
    #ifdef CONFIG_KEXEC
    #include <asm/kexec.h>

    -ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE,
    - "kexec control code size is too big");
    +. = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE,
    + "kexec control code size is too big");
    #endif
    +

    \
     
     \ /
      Last update: 2009-10-15 08:25    [W:0.027 / U:91.824 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site