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

Commit 601adfed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'topic/x86-lds-nits' of... 

Merge branch 'topic/x86-lds-nits' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland

* 'topic/x86-lds-nits' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86: linker script syntax nits
parents 655bdb0e e9a63a4e

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

+8 −9
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,7 +332,6 @@ INIT_PER_CPU(irq_stack_union); 
#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