diff options
| -rw-r--r-- | arch/x86/kernel/acpi/realmode/wakeup.lds.S | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.lds.S b/arch/x86/kernel/acpi/realmode/wakeup.lds.S index 7da00b799cda..0e50e1e5c573 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S +++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S | |||
| @@ -56,6 +56,6 @@ SECTIONS | |||
| 56 | /DISCARD/ : { | 56 | /DISCARD/ : { |
| 57 | *(.note*) | 57 | *(.note*) |
| 58 | } | 58 | } |
| 59 | |||
| 60 | . = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!"); | ||
| 61 | } | 59 | } |
| 60 | |||
| 61 | ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!"); | ||
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 92929fb3f9fa..8d6001ad8d8d 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S | |||
| @@ -305,8 +305,8 @@ SECTIONS | |||
| 305 | 305 | ||
| 306 | 306 | ||
| 307 | #ifdef CONFIG_X86_32 | 307 | #ifdef CONFIG_X86_32 |
| 308 | . = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), | 308 | ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), |
| 309 | "kernel image bigger than KERNEL_IMAGE_SIZE"); | 309 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
| 310 | #else | 310 | #else |
| 311 | /* | 311 | /* |
| 312 | * Per-cpu symbols which need to be offset from __per_cpu_load | 312 | * Per-cpu symbols which need to be offset from __per_cpu_load |
| @@ -319,12 +319,12 @@ INIT_PER_CPU(irq_stack_union); | |||
| 319 | /* | 319 | /* |
| 320 | * Build-time check on the image size: | 320 | * Build-time check on the image size: |
| 321 | */ | 321 | */ |
| 322 | . = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), | 322 | ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), |
| 323 | "kernel image bigger than KERNEL_IMAGE_SIZE"); | 323 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
| 324 | 324 | ||
| 325 | #ifdef CONFIG_SMP | 325 | #ifdef CONFIG_SMP |
| 326 | . = ASSERT((per_cpu__irq_stack_union == 0), | 326 | ASSERT((per_cpu__irq_stack_union == 0), |
| 327 | "irq_stack_union is not at start of per-cpu area"); | 327 | "irq_stack_union is not at start of per-cpu area"); |
| 328 | #endif | 328 | #endif |
| 329 | 329 | ||
| 330 | #endif /* CONFIG_X86_32 */ | 330 | #endif /* CONFIG_X86_32 */ |
| @@ -332,7 +332,6 @@ INIT_PER_CPU(irq_stack_union); | |||
| 332 | #ifdef CONFIG_KEXEC | 332 | #ifdef CONFIG_KEXEC |
| 333 | #include <asm/kexec.h> | 333 | #include <asm/kexec.h> |
| 334 | 334 | ||
| 335 | . = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, | 335 | ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, |
| 336 | "kexec control code size is too big"); | 336 | "kexec control code size is too big"); |
| 337 | #endif | 337 | #endif |
| 338 | |||
