diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-08-03 17:44:54 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-03 17:44:54 -0400 |
commit | d2ba8b211bb8abc29aa627dbd4dce08cfbc8082b (patch) | |
tree | 3033735812e45a30e4735805dc76c519e2405ca1 /arch/x86/kernel | |
parent | 6a7bbd57ed50bb62c9a81ae5f2e202ca689e5964 (diff) |
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: Jean Delvare <khali@linux-fr.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 59f31d2dd435..78d185d797de 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S | |||
@@ -393,8 +393,8 @@ SECTIONS | |||
393 | 393 | ||
394 | 394 | ||
395 | #ifdef CONFIG_X86_32 | 395 | #ifdef CONFIG_X86_32 |
396 | ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), | 396 | . = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), |
397 | "kernel image bigger than KERNEL_IMAGE_SIZE") | 397 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
398 | #else | 398 | #else |
399 | /* | 399 | /* |
400 | * Per-cpu symbols which need to be offset from __per_cpu_load | 400 | * Per-cpu symbols which need to be offset from __per_cpu_load |
@@ -407,12 +407,12 @@ INIT_PER_CPU(irq_stack_union); | |||
407 | /* | 407 | /* |
408 | * Build-time check on the image size: | 408 | * Build-time check on the image size: |
409 | */ | 409 | */ |
410 | ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), | 410 | . = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), |
411 | "kernel image bigger than KERNEL_IMAGE_SIZE") | 411 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
412 | 412 | ||
413 | #ifdef CONFIG_SMP | 413 | #ifdef CONFIG_SMP |
414 | ASSERT((per_cpu__irq_stack_union == 0), | 414 | . = ASSERT((per_cpu__irq_stack_union == 0), |
415 | "irq_stack_union is not at start of per-cpu area"); | 415 | "irq_stack_union is not at start of per-cpu area"); |
416 | #endif | 416 | #endif |
417 | 417 | ||
418 | #endif /* CONFIG_X86_32 */ | 418 | #endif /* CONFIG_X86_32 */ |
@@ -420,7 +420,7 @@ ASSERT((per_cpu__irq_stack_union == 0), | |||
420 | #ifdef CONFIG_KEXEC | 420 | #ifdef CONFIG_KEXEC |
421 | #include <asm/kexec.h> | 421 | #include <asm/kexec.h> |
422 | 422 | ||
423 | ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, | 423 | . = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, |
424 | "kexec control code size is too big") | 424 | "kexec control code size is too big"); |
425 | #endif | 425 | #endif |
426 | 426 | ||