aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Korotaev <dev@openvz.org>2007-02-05 16:19:59 -0800
committerTony Luck <tony.luck@intel.com>2007-02-05 16:45:42 -0800
commitd00195ebc18049f067c8e389c186aa6f5d2b659f (patch)
treec39b315262e2e34fb8a7e5898a386fc375cd4c88
parent[IA64] register memory ranges in a consistent manner (diff)
downloadlinux-dev-d00195ebc18049f067c8e389c186aa6f5d2b659f.tar.xz
linux-dev-d00195ebc18049f067c8e389c186aa6f5d2b659f.zip
[IA64] alignment bug in ldscript
Occasionally the FSYS_RETURN patch list can have an odd length, causing other data structures to get out of alignment. In OpenVZ it is odd and we get misaligned kernel image, which does not boot. Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Signed-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/kernel/vmlinux.lds.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index d6083a0936f4..8f3d0066f446 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -157,6 +157,7 @@ SECTIONS
}
#endif
+ . = ALIGN(8);
__con_initcall_start = .;
.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET)
{ *(.con_initcall.init) }