From owner-p4-projects@FreeBSD.ORG  Tue Oct  4 21:44:25 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 219A616A423; Tue,  4 Oct 2005 21:44:25 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 D4AC716A41F
	for <perforce@freebsd.org>; Tue,  4 Oct 2005 21:44:24 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9486A43D49
	for <perforce@freebsd.org>; Tue,  4 Oct 2005 21:44:24 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j94LiO78067882
	for <perforce@freebsd.org>; Tue, 4 Oct 2005 21:44:24 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j94LiO8e067879
	for perforce@freebsd.org; Tue, 4 Oct 2005 21:44:24 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 4 Oct 2005 21:44:24 GMT
Message-Id: <200510042144.j94LiO8e067879@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>
Cc: 
Subject: PERFORCE change 84816 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 04 Oct 2005 21:44:25 -0000

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

Change 84816 by peter@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) ====