PERFORCE change 84816 for review

[Peter Wemm]

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

Change 84816 by peter at peter_daintree on 2005/10/04 21:43:32

	Integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#29 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#57 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#107 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#76 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#29 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#57 (text+ko) ====

@@ -312,7 +312,7 @@
 
 	/* Program timer LVT and setup handler. */
 	lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer);
-	snprintf(buf, sizeof(buf), "lapic%d: timer", lapic_id());
+	snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid));
 	intrcnt_add(buf, &la->la_timer_count);
 	if (PCPU_GET(cpuid) != 0) {
 		KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor",

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#107 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/trap.c#76 (text+ko) ====