tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 601adfed 655bdb0e

+10 -11
unified split
+2 -2
arch/x86/kernel/acpi/realmode/wakeup.lds.S
··· 56 56 /DISCARD/ : { 57 57 *(.note*) 58 58 } 59 - 60 - . = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!"); 61 59 } 60 + 61 + ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
+8 -9
arch/x86/kernel/vmlinux.lds.S
··· 305 305 306 306 307 307 #ifdef CONFIG_X86_32 308 - . = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), 309 - "kernel image bigger than KERNEL_IMAGE_SIZE"); 308 + ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), 309 + "kernel image bigger than KERNEL_IMAGE_SIZE"); 310 310 #else 311 311 /* 312 312 * Per-cpu symbols which need to be offset from __per_cpu_load ··· 319 319 /* 320 320 * Build-time check on the image size: 321 321 */ 322 - . = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), 323 - "kernel image bigger than KERNEL_IMAGE_SIZE"); 322 + ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), 323 + "kernel image bigger than KERNEL_IMAGE_SIZE"); 324 324 325 325 #ifdef CONFIG_SMP 326 - . = ASSERT((per_cpu__irq_stack_union == 0), 327 - "irq_stack_union is not at start of per-cpu area"); 326 + ASSERT((per_cpu__irq_stack_union == 0), 327 + "irq_stack_union is not at start of per-cpu area"); 328 328 #endif 329 329 330 330 #endif /* CONFIG_X86_32 */ ··· 332 332 #ifdef CONFIG_KEXEC 333 333 #include <asm/kexec.h> 334 334 335 - . = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, 336 - "kexec control code size is too big"); 335 + ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, 336 + "kexec control code size is too big"); 337 337 #endif 338 -