diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:10:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:10:26 -0700 |
| commit | 7811a32407b971d9086c46403124f1453b95c430 (patch) | |
| tree | 9bd78bfb7ca72170dcfe0d514848ec219704917e /arch/x86/kernel/acpi/realmode/wakeup.lds.S | |
| parent | c896a2e0d80bbd5731f76609625a0cb7c9864a44 (diff) | |
| parent | 02dd0a0613e0d84c7dd8315e3fe6204d005b7c79 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: Set DELIVERY_MODE=4 for vector=NMI_VECTOR in uv_hub_send_ipi()
x86, UV: Fix and clean up bau code to use uv_gpa_to_pnode()
x86: Don't print number of MCE banks for every CPU
x86, UV: Fix information in __uv_hub_info structure
x86: Document linker script ASSERT() quirk
Diffstat (limited to 'arch/x86/kernel/acpi/realmode/wakeup.lds.S')
| -rw-r--r-- | arch/x86/kernel/acpi/realmode/wakeup.lds.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.lds.S b/arch/x86/kernel/acpi/realmode/wakeup.lds.S index 7da00b799cd..060fff8f5c5 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S +++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S @@ -57,5 +57,8 @@ SECTIONS *(.note*) } + /* + * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility: + */ . = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!"); } |