diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:59:47 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:59:47 +0300 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/x86/boot/setup.ld | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
| download | linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.xz | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'arch/x86/boot/setup.ld')
| -rw-r--r-- | arch/x86/boot/setup.ld | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld index 0f6ec455a2b1..03c0683636b6 100644 --- a/arch/x86/boot/setup.ld +++ b/arch/x86/boot/setup.ld @@ -53,6 +53,9 @@ SECTIONS /DISCARD/ : { *(.note*) } + /* + * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility: + */ . = ASSERT(_end <= 0x8000, "Setup too big!"); . = ASSERT(hdr == 0x1f1, "The setup header has the wrong offset!"); /* Necessary for the very-old-loader check to work... */ |