Index: linux-2.6.14-ck3/drivers/block/scsi_ioctl.c
===================================================================
--- linux-2.6.14-ck3.orig/drivers/block/scsi_ioctl.c	2005-10-28 13:03:03.000000000 +1000
+++ linux-2.6.14-ck3/drivers/block/scsi_ioctl.c	2005-11-08 11:03:13.000000000 +1100
@@ -62,7 +62,7 @@ static int scsi_get_bus(request_queue_t 
 
 static int sg_get_timeout(request_queue_t *q)
 {
-	return q->sg_timeout / (HZ / USER_HZ);
+	return q->sg_timeout / (HZ / (USER_HZ + 1) + 1);
 }
 
 static int sg_set_timeout(request_queue_t *q, int __user *p)
Index: linux-2.6.14-ck3/drivers/scsi/sg.c
===================================================================
--- linux-2.6.14-ck3.orig/drivers/scsi/sg.c	2005-10-28 13:03:04.000000000 +1000
+++ linux-2.6.14-ck3/drivers/scsi/sg.c	2005-11-08 12:02:31.000000000 +1100
@@ -87,6 +87,13 @@ static void sg_proc_cleanup(void);
  */
 #define MULDIV(X,MUL,DIV) ((((X % DIV) * MUL) / DIV) + ((X / DIV) * MUL))
 
+static inline int muldiv(int x, int m, int d)
+{
+	if (m > d)
+		return INT_MAX;
+	return MULDIV(x, m, d);
+}
+
 #define SG_DEFAULT_TIMEOUT MULDIV(SG_DEFAULT_TIMEOUT_USER, HZ, USER_HZ)
 
 int sg_big_buff = SG_DEF_RESERVED_SIZE;
@@ -847,10 +854,10 @@ sg_ioctl(struct inode *inode, struct fil
 			return result;
 		if (val < 0)
 			return -EIO;
-		if (val >= MULDIV (INT_MAX, USER_HZ, HZ))
-		    val = MULDIV (INT_MAX, USER_HZ, HZ);
+		if (val >= muldiv(INT_MAX, USER_HZ, HZ))
+		    val = muldiv(INT_MAX, USER_HZ, HZ);
 		sfp->timeout_user = val;
-		sfp->timeout = MULDIV (val, HZ, USER_HZ);
+		sfp->timeout = muldiv(val, HZ, USER_HZ);
 
 		return 0;
 	case SG_GET_TIMEOUT:	/* N.B. User receives timeout as return value */