Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db8590f5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Revert "x86: linker script syntax nits" 



This reverts commit e9a63a4e.

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

See this commit for further details:

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

Acked-by: default avatar"H. Peter Anvin" <hpa@zytor.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <4AD6523D.5030909@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a0738a68

arch/x86/kernel/acpi/realmode/wakeup.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -56,6 +56,6 @@ SECTIONS 
	/DISCARD/ : {

		*(.note*)

	}

}



ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
 
	. = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");

}

arch/x86/kernel/vmlinux.lds.S

+9 −8
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ SECTIONS 




#ifdef CONFIG_X86_32

ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),

. = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),

	   "kernel image bigger than KERNEL_IMAGE_SIZE");

#else

/*
@@ -319,11 +319,11 @@ INIT_PER_CPU(irq_stack_union); 
/*

 * Build-time check on the image size:

 */

ASSERT((_end - _text <= 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),

. = ASSERT((per_cpu__irq_stack_union == 0),

           "irq_stack_union is not at start of per-cpu area");

#endif
@@ -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,

. = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE,

           "kexec control code size is too big");

#endif