From owner-p4-projects@FreeBSD.ORG  Mon Oct 24 20:44:53 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 3200016A421; Mon, 24 Oct 2005 20:44:53 +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 0C52516A41F
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 20:44:53 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C97E743D45
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 20:44:52 +0000 (GMT)
	(envelope-from jhb@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 j9OKiqcr037156
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 20:44:52 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OKiq51037153
	for perforce@freebsd.org; Mon, 24 Oct 2005 20:44:52 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 24 Oct 2005 20:44:52 GMT
Message-Id: <200510242044.j9OKiq51037153@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85795 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: Mon, 24 Oct 2005 20:44:54 -0000

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

Change 85795 by jhb@jhb_slimer on 2005/10/24 20:44:44

	IFC @85793.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#27 integrate
.. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#10 branch
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#92 integrate
.. //depot/projects/smpng/sys/kern/subr_kdb.c#13 integrate

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#27 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.262 2005/08/19 22:10:19 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.263 2005/10/24 20:31:04 jhb Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -916,7 +916,6 @@
 	}
 }
 
-
 void
 ipi_bitmap_handler(struct clockframe frame)
 {

==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#92 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.254 2005/09/28 18:04:11 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.255 2005/10/24 20:31:04 jhb Exp $");
 
 #include "opt_apic.h"
 #include "opt_cpu.h"

==== //depot/projects/smpng/sys/kern/subr_kdb.c#13 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.13 2005/09/27 21:12:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.14 2005/10/24 20:31:04 jhb Exp $");
 
 #include "opt_kdb.h"
 
@@ -324,16 +324,16 @@
 #endif
   
 	if (thr == curthread) 
-		return &kdb_pcb;
+		return (&kdb_pcb);
 
 #ifdef HAVE_STOPPEDPCBS
 	SLIST_FOREACH(pc, &cpuhead, pc_allcpu)  {
 		cpuid = pc->pc_cpuid;
 		if (pc->pc_curthread == thr && (stopped_cpus & (1 << cpuid)))
-			return &stoppcbs[cpuid];
+			return (&stoppcbs[cpuid]);
 	}
 #endif
-	return  thr->td_pcb;
+	return (thr->td_pcb);
 }
 
 struct thread *