diff --git a/[refs] b/[refs]
index 1cbc1a53a5b2..71611c87dff8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25e2cf1c1ac52d5078cf8cc3fd2f2ad084669ddd
+refs/heads/master: f5bfa159d20c9a25c44a7f848c70d4156f78ba64
diff --git a/trunk/arch/s390/include/asm/lowcore.h b/trunk/arch/s390/include/asm/lowcore.h
index a47c6e221a95..47853debb3b9 100644
--- a/trunk/arch/s390/include/asm/lowcore.h
+++ b/trunk/arch/s390/include/asm/lowcore.h
@@ -302,7 +302,12 @@ struct _lowcore {
 	 */
 	__u64	ipib;				/* 0x0e00 */
 	__u32	ipib_checksum;			/* 0x0e08 */
-	__u64	vmcore_info;			/* 0x0e0c */
+	/*
+	 * Because the vmcore_info pointer is not 8 byte aligned it never
+	 * should not be accessed directly. For accessing the pointer, first
+	 * copy it to a local pointer variable.
+	 */
+	__u8	vmcore_info[8];			/* 0x0e0c */
 	__u8	pad_0x0e14[0x0e18-0x0e14];	/* 0x0e14 */
 	__u64	os_info;			/* 0x0e18 */
 	__u8	pad_0x0e20[0x0f00-0x0e20];	/* 0x0e20 */