From owner-p4-projects@FreeBSD.ORG  Thu Apr 10 23:33:31 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7DA5F37B404; Thu, 10 Apr 2003 23:33:30 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1B6ED37B401
	for <perforce@freebsd.org>; Thu, 10 Apr 2003 23:33:30 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BCC8843FA3
	for <perforce@freebsd.org>; Thu, 10 Apr 2003 23:33:29 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3B6XT0U085793
	for <perforce@freebsd.org>; Thu, 10 Apr 2003 23:33:29 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3B6XTJw085790
	for perforce@freebsd.org; Thu, 10 Apr 2003 23:33:29 -0700 (PDT)
Date: Thu, 10 Apr 2003 23:33:29 -0700 (PDT)
Message-Id: <200304110633.h3B6XTJw085790@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28754 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Apr 2003 06:33:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=28754

Change 28754 by peter@peter_daintree on 2003/04/10 23:32:49

	OK, I have to laugh about this one.
	keep gcc-3.3 happy where long > int (speed_t is
	unsigned int)

Affected files ...

.. //depot/projects/hammer/sys/dev/sio/sio.c#9 edit

Differences ...

==== //depot/projects/hammer/sys/dev/sio/sio.c#9 (text+ko) ====

@@ -1542,8 +1542,12 @@
 	u_int	divisor;
 	int	error;
 
-	if (speed == 0 || speed > (ULONG_MAX - 1) / 8)
+	if (speed == 0)
+		return (0);
+#if UINT_MAX > (ULONG_MAX - 1) / 8
+	if (speed > (ULONG_MAX - 1) / 8)
 		return (0);
+#endif
 	divisor = (rclk / (8UL * speed) + 1) / 2;
 	if (divisor == 0 || divisor >= 65536)
 		return (0);