From c4120b174ee649d021af88909efe882e2e5a322e Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 1 May 2006 12:16:14 -0700
Subject: [PATCH] --- yaml --- r: 26415 b: refs/heads/master c:
 022e4fc0fb2e4e179aaba4ee139dcb8fded0cba2 h: refs/heads/master i:   26413:
 7dcf7131d9880888a4437a87876791a53d12800f   26411:
 5971289f7b6e876303d96518f579c128057e656f   26407:
 a2d5ae5a42c4927c90f184bd0d652d53ece0d369   26399:
 5105c1feb0a36bf0ab1a79c104ff32024309f2bb v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/s390/s390mach.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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.