From owner-p4-projects@FreeBSD.ORG  Tue Sep 30 00:13:45 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5CCF116A4C0; Tue, 30 Sep 2003 00:13:45 -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 3819E16A4B3
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 00:13:45 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B646843FA3
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 00:13:44 -0700 (PDT)
	(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 h8U7DiXJ052705
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 00:13:44 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U7DiOs052702
	for perforce@freebsd.org; Tue, 30 Sep 2003 00:13:44 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Tue, 30 Sep 2003 00:13:44 -0700 (PDT)
Message-Id: <200309300713.h8U7DiOs052702@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 38850 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: Tue, 30 Sep 2003 07:13:45 -0000

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

Change 38850 by peter@peter_hammer on 2003/09/30 00:13:23

	mismerge. clkintr takes a struct clockframe * already.

Affected files ...

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

Differences ...

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

@@ -184,7 +184,7 @@
 		clkintr_pending = 0;
 		mtx_unlock_spin(&clock_lock);
 	}
-	timer_func(&frame);
+	timer_func(frame);
 #ifdef SMP
 	if (timer_func == hardclock)
 		forward_hardclock();
@@ -234,7 +234,7 @@
 			timer0_prescaler_count = 0;
 			timer_func = hardclock;
 			timer0_state = RELEASED;
-			hardclock(&frame);
+			hardclock(frame);
 #ifdef SMP
 			forward_hardclock();
 #endif