svn commit: r222001 - in head/sys: kern sys

[Attilio Rao]

Author: attilio
Date: Mon May 16 23:20:12 2011
New Revision: 222001
URL: http://svn.freebsd.org/changeset/base/222001

Log:
  Merge r221278 from largeSMP project:
  idle_cpus_mask is just used in sched_4bsd, thus make it private for it.
  
  Tested by:	several

Modified:
  head/sys/kern/sched_4bsd.c
  head/sys/kern/subr_smp.c
  head/sys/sys/smp.h

Modified: head/sys/kern/sched_4bsd.c
==============================================================================
--- head/sys/kern/sched_4bsd.c	Mon May 16 19:29:58 2011	(r222000)
+++ head/sys/kern/sched_4bsd.c	Mon May 16 23:20:12 2011	(r222001)
@@ -155,6 +155,8 @@ static struct runq runq;
  */
 static struct runq runq_pcpu[MAXCPU];
 long runq_length[MAXCPU];
+
+static cpumask_t idle_cpus_mask;
 #endif
 
 struct pcpuidlestat {

Modified: head/sys/kern/subr_smp.c
==============================================================================
--- head/sys/kern/subr_smp.c	Mon May 16 19:29:58 2011	(r222000)
+++ head/sys/kern/subr_smp.c	Mon May 16 23:20:12 2011	(r222001)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #ifdef SMP
 volatile cpumask_t stopped_cpus;
 volatile cpumask_t started_cpus;
-cpumask_t idle_cpus_mask;
 cpumask_t hlt_cpus_mask;
 cpumask_t logical_cpus_mask;
 

Modified: head/sys/sys/smp.h
==============================================================================
--- head/sys/sys/smp.h	Mon May 16 19:29:58 2011	(r222000)
+++ head/sys/sys/smp.h	Mon May 16 23:20:12 2011	(r222001)
@@ -73,7 +73,6 @@ extern int smp_active;
 extern int smp_cpus;
 extern volatile cpumask_t started_cpus;
 extern volatile cpumask_t stopped_cpus;
-extern cpumask_t idle_cpus_mask;
 extern cpumask_t hlt_cpus_mask;
 extern cpumask_t logical_cpus_mask;
 #endif /* SMP */