From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 1 May 2006 19:16:14 +0000 (-0700)
Subject: [PATCH] s390: fix ipd handling
X-Git-Tag: v2.6.17-rc4~70
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=022e4fc0fb2e4e179aaba4ee139dcb8fded0cba2;p=linux-2.6

[PATCH] s390: fix ipd handling

As pointed out by Paulo Marques <pmarques@grupopie.com> MAX_IPD_TIME is by
a factor of ten too small.  Since this means that we allow ten times more
IPDs in the intended time frame this could result in a cpu check stop of a
physical cpu.

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 5ae1480309..f99e55308b 100644
--- a/drivers/s390/s390mach.c
+++ b/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.