From owner-p4-projects@FreeBSD.ORG  Fri Nov 14 14:58:37 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B2AF16A4D0; Fri, 14 Nov 2003 14:58:37 -0800 (PST)
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 EAD5E16A4CE
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 14:58:36 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6EF2743FB1
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 14:58:36 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAEMwaXJ081933
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 14:58:36 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAEMwaq2081930
	for perforce@freebsd.org; Fri, 14 Nov 2003 14:58:36 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 14 Nov 2003 14:58:36 -0800 (PST)
Message-Id: <200311142258.hAEMwaq2081930@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 42402 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, 14 Nov 2003 22:58:37 -0000

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

Change 42402 by peter@peter_daintree on 2003/11/14 14:58:01

	fix merge-o's

Affected files ...

.. //depot/projects/hammer/sys/amd64/isa/clock.c#14 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/isa/clock.c#14 (text+ko) ====

@@ -114,6 +114,7 @@
 static	u_int32_t i8254_lastcount;
 static	u_int32_t i8254_offset;
 static	int	i8254_ticked;
+static	struct intsrc *i8254_intsrc;
 static	u_char	rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
 static	u_char	rtc_statusb = RTCSB_24HR | RTCSB_PINTR;
 
@@ -153,7 +154,7 @@
 		clkintr_pending = 0;
 		mtx_unlock_spin(&clock_lock);
 	}
-	timer_func(&frame);
+	timer_func(frame);
 }
 
 int