diff --git a/[refs] b/[refs]
index de8df89fc32c..e2d8dee1f66b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 029e5b1636d0511ef143af3a20c83c48e44c03f3
+refs/heads/master: bbf2a330d92c5afccfd17592ba9ccd50f41cf748
diff --git a/trunk/arch/x86/include/asm/atomic_32.h b/trunk/arch/x86/include/asm/atomic_32.h
index 2503d4e64c2a..ae0fbb5b0578 100644
--- a/trunk/arch/x86/include/asm/atomic_32.h
+++ b/trunk/arch/x86/include/asm/atomic_32.h
@@ -250,7 +250,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 /* An 64bit atomic type */
 
 typedef struct {
-	unsigned long long counter;
+	unsigned long long __aligned(8) counter;
 } atomic64_t;
 
 #define ATOMIC64_INIT(val)	{ (val) }