diff --git a/[refs] b/[refs]
index 2e65224e1b22..eb718b127771 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8261aa600943046a5305564a1cd7432009971799
+refs/heads/master: 022e4fc0fb2e4e179aaba4ee139dcb8fded0cba2
diff --git a/trunk/drivers/s390/s390mach.c b/trunk/drivers/s390/s390mach.c
index 5ae14803091f..f99e55308b32 100644
--- a/trunk/drivers/s390/s390mach.c
+++ b/trunk/drivers/s390/s390mach.c
@@ -13,6 +13,7 @@
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/workqueue.h>
+#include <linux/time.h>
 
 #include <asm/lowcore.h>
 
@@ -363,7 +364,7 @@ s390_revalidate_registers(struct mci *mci)
 }
 
 #define MAX_IPD_COUNT	29
-#define MAX_IPD_TIME	(5 * 60 * 100 * 1000) /* 5 minutes */
+#define MAX_IPD_TIME	(5 * 60 * USEC_PER_SEC) /* 5 minutes */
 
 /*
  * machine check handler.