PERFORCE change 85795 for review

John Baldwin jhb at FreeBSD.org
Mon Oct 24 13:44:54 PDT 2005


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

Change 85795 by jhb at 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 *


More information about the p4-projects mailing list