PERFORCE change 42402 for review

[Peter Wemm]

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

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