diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-05-01 15:16:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 21:17:46 -0400 |
commit | 022e4fc0fb2e4e179aaba4ee139dcb8fded0cba2 (patch) | |
tree | fbe70e06b897015226d209f54225e68f52ff7dc5 /drivers | |
parent | 8261aa600943046a5305564a1cd7432009971799 (diff) |
[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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/s390mach.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c index 5ae14803091f..f99e55308b32 100644 --- a/drivers/s390/s390mach.c +++ b/drivers/s390/s390mach.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
15 | #include <linux/workqueue.h> | 15 | #include <linux/workqueue.h> |
16 | #include <linux/time.h> | ||
16 | 17 | ||
17 | #include <asm/lowcore.h> | 18 | #include <asm/lowcore.h> |
18 | 19 | ||
@@ -363,7 +364,7 @@ s390_revalidate_registers(struct mci *mci) | |||
363 | } | 364 | } |
364 | 365 | ||
365 | #define MAX_IPD_COUNT 29 | 366 | #define MAX_IPD_COUNT 29 |
366 | #define MAX_IPD_TIME (5 * 60 * 100 * 1000) /* 5 minutes */ | 367 | #define MAX_IPD_TIME (5 * 60 * USEC_PER_SEC) /* 5 minutes */ |
367 | 368 | ||
368 | /* | 369 | /* |
369 | * machine check handler. | 370 | * machine check handler. |