PERFORCE change 38850 for review

[Peter Wemm]

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

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