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

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
...@@ -56,6 +56,6 @@ SECTIONS ...@@ -56,6 +56,6 @@ SECTIONS
/DISCARD/ : { /DISCARD/ : {
*(.note*) *(.note*)
} }
. = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
} }
ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
...@@ -305,7 +305,7 @@ SECTIONS ...@@ -305,7 +305,7 @@ SECTIONS
#ifdef CONFIG_X86_32 #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"); "kernel image bigger than KERNEL_IMAGE_SIZE");
#else #else
/* /*
...@@ -319,11 +319,11 @@ INIT_PER_CPU(irq_stack_union); ...@@ -319,11 +319,11 @@ INIT_PER_CPU(irq_stack_union);
/* /*
* Build-time check on the image size: * 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"); "kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP #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"); "irq_stack_union is not at start of per-cpu area");
#endif #endif
...@@ -332,7 +332,6 @@ INIT_PER_CPU(irq_stack_union); ...@@ -332,7 +332,6 @@ INIT_PER_CPU(irq_stack_union);
#ifdef CONFIG_KEXEC #ifdef CONFIG_KEXEC
#include <asm/kexec.h> #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"); "kexec control code size is too big");
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment