diff --git a/[refs] b/[refs]
index fbb2808d2103..e5eb2358b7ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6649a7e5a9ee99e9623878f4a5579cc2f6cdd51
+refs/heads/master: 178514d7e3e8cfba087b3a208e22a54ce65e8f34
diff --git a/trunk/arch/s390/include/asm/cpu.h b/trunk/arch/s390/include/asm/cpu.h
index 471234b90574..e0b69540216f 100644
--- a/trunk/arch/s390/include/asm/cpu.h
+++ b/trunk/arch/s390/include/asm/cpu.h
@@ -20,7 +20,7 @@ struct cpuid
 	unsigned int ident   : 24;
 	unsigned int machine : 16;
 	unsigned int unused  : 16;
-} __packed;
+} __attribute__ ((packed, aligned(8)));
 
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_S390_CPU_H */