From d2ed18d78918fb93faac734b1e8d5ab1550fa497 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 30 Jun 2009 11:41:13 -0700
Subject: [PATCH] --- yaml --- r: 154579 b: refs/heads/master c:
 2a2325e6e8a3782795fb520220c36fd805775972 h: refs/heads/master i:   154577:
 4d896c6d7ccc1d25bca59d518215592e9ccaa4e5   154575:
 cfed10814c0649be502932d230a965bea9a5a5bb v: v3

---
 [refs]                                  | 2 +-
 trunk/include/asm-generic/vmlinux.lds.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4b8ef302622a..2ab2ea1774b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 133890103b9de08904f909995973e4b5c08a780e
+refs/heads/master: 2a2325e6e8a3782795fb520220c36fd805775972
diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h
index 92b73b6140ff..dccdbed05848 100644
--- a/trunk/include/asm-generic/vmlinux.lds.h
+++ b/trunk/include/asm-generic/vmlinux.lds.h
@@ -441,7 +441,8 @@
 	}
 
 #ifdef CONFIG_CONSTRUCTORS
-#define KERNEL_CTORS()	VMLINUX_SYMBOL(__ctors_start) = .; \
+#define KERNEL_CTORS()	. = ALIGN(8);			   \
+			VMLINUX_SYMBOL(__ctors_start) = .; \
 			*(.ctors)			   \
 			VMLINUX_SYMBOL(__ctors_end) = .;
 #else