[src/netbsd-1-5]: src/sys/dev/ic pull up 1.26->1.27, approved by jhawk:

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/07dc1b7c321a
branches:  netbsd-1-5
changeset: 488810:07dc1b7c321a
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Jul 30 16:45:36 2000 +0000

description:
pull up 1.26->1.27, approved by jhawk:
Fixes 32bit interger overflow with large timeout. Fixes kern/10575.

diffstat:

 sys/dev/ic/siop.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 849bc035d31d -r 07dc1b7c321a sys/dev/ic/siop.c
--- a/sys/dev/ic/siop.c Sun Jul 30 16:35:58 2000 +0000
+++ b/sys/dev/ic/siop.c Sun Jul 30 16:45:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siop.c,v 1.21.2.2 2000/07/24 16:51:38 bouyer Exp $     */
+/*     $NetBSD: siop.c,v 1.21.2.3 2000/07/30 16:45:36 bouyer Exp $     */
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -1367,9 +1367,9 @@
                                        if ((siop_cmd->xs->xs_control &
                                            XS_CTL_POLL) == 0) {
                                                /* start exire timer */
-                                               timeout =
+                                               timeout = (u_int64_t)
                                                    siop_cmd->xs->timeout *
-                                                   hz / 1000;
+                                                   (u_int64_t)hz / 1000;
                                                if (timeout == 0)
                                                        timeout = 1;
                                                callout_reset(