From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 19:54:05 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EFD7437B407; Fri,  4 Apr 2003 19:54:03 -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 8CAE637B401
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 19:54:03 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 37DF843FAF
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 19:54:03 -0800 (PST)
	(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 h353s30U001437
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 19:54:03 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353s2b7001434
	for perforce@freebsd.org; Fri, 4 Apr 2003 19:54:02 -0800 (PST)
Date: Fri, 4 Apr 2003 19:54:02 -0800 (PST)
Message-Id: <200304050354.h353s2b7001434@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 28158 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: Sat, 05 Apr 2003 03:54:05 -0000

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

Change 28158 by peter@peter_overcee on 2003/04/04 19:53:44

	make it compile

Affected files ...

.. //depot/projects/hammer/sys/x86_64/isa/clock.c#9 edit

Differences ...

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

@@ -65,7 +65,6 @@
 #include <sys/power.h>
 
 #include <machine/clock.h>
-#include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/limits.h>
 #include <machine/md_var.h>
@@ -928,9 +927,9 @@
 {
 	u_int count;
 	u_int high, low;
-	u_int eflags;
+	u_long rflags;
 
-	eflags = read_eflags();
+	rflags = read_rflags();
 	mtx_lock_spin(&clock_lock);
 
 	/* Select timer0 and latch counter value. */
@@ -941,7 +940,7 @@
 	count = timer0_max_count - ((high << 8) | low);
 	if (count < i8254_lastcount ||
 	    (!i8254_ticked && (clkintr_pending ||
-	    ((count < 20 || (!(eflags & PSL_I) && count < timer0_max_count / 2u)) &&
+	    ((count < 20 || (!(rflags & PSL_I) && count < timer0_max_count / 2u)) &&
 	    (inb(IO_ICU1) & 1)))
 	    )) {
 		i8254_ticked = 1;