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

Commit d2ba8b21 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: Fix assert syntax in vmlinux.lds.S 



Older versions of binutils did not accept the naked "ASSERT" syntax;
it is considered an expression whose value needs to be assigned to
something.

Reported-tested-and-fixed-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 6a7bbd57

arch/x86/kernel/vmlinux.lds.S

+8 −8
Original line number Diff line number Diff line
@@ -393,8 +393,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
@@ -407,11 +407,11 @@ 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),

. = ASSERT((per_cpu__irq_stack_union == 0),

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

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