From: Kirill Korotaev <dev@openvz.org>
Date: Tue, 6 Feb 2007 00:19:59 +0000 (-0800)
Subject: [IA64] alignment bug in ldscript
X-Git-Tag: v2.6.21-rc2~42^2~16^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d00195ebc18049f067c8e389c186aa6f5d2b659f;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index d6083a0936f..8f3d0066f44 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) }