GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 06:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 'topic/x86-lds-nits' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86: linker script syntax nits
This commit is contained in:
Linus Torvalds 2009-10-14 15:33:05 -07:00
commit 601adfedba
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/acpi/realmode/wakeup.lds.S
View file

@ -56,6 +56,6 @@ SECTIONS
/DISCARD/ : { /DISCARD/ : {
*(.note*) *(.note*)
} }
. = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
} }
ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");

9
arch/x86/kernel/vmlinux.lds.S
View file

@ -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);
/* /*
* 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);
#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