PERFORCE change 28158 for review

[Peter Wemm]

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

Change 28158 by peter at 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;