From owner-svn-src-projects@FreeBSD.ORG  Thu Feb  7 10:40:46 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 33240273;
 Thu,  7 Feb 2013 10:40:46 +0000 (UTC)
 (envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 267063CF;
 Thu,  7 Feb 2013 10:40:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r17Aej63010357;
 Thu, 7 Feb 2013 10:40:45 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r17Aej5x010356;
 Thu, 7 Feb 2013 10:40:45 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201302071040.r17Aej5x010356@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Thu, 7 Feb 2013 10:40:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246459 - projects/calloutng/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Feb 2013 10:40:46 -0000

Author: davide
Date: Thu Feb  7 10:40:45 2013
New Revision: 246459
URL: http://svnweb.freebsd.org/changeset/base/246459

Log:
  Fix a braino. Pass the correct argument to DELAY() and unbreak pause_sbt().
  
  Reported by:	mav

Modified:
  projects/calloutng/sys/kern/kern_synch.c

Modified: projects/calloutng/sys/kern/kern_synch.c
==============================================================================
--- projects/calloutng/sys/kern/kern_synch.c	Thu Feb  7 10:37:36 2013	(r246458)
+++ projects/calloutng/sys/kern/kern_synch.c	Thu Feb  7 10:40:45 2013	(r246459)
@@ -369,7 +369,7 @@ pause_sbt(const char *wmesg, sbintime_t 
 			DELAY(1000000);
 			sbt_sec--;
 		}
-		DELAY(sbt / SBT_1US);
+		DELAY((sbt & 0xffffffff) / SBT_1US);
 		return (0);
 	}
 	return (_sleep(&pause_wchan, NULL, 0, wmesg, sbt, pr, flags));