From owner-svn-src-head@FreeBSD.ORG  Mon May 16 23:20:13 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30457106566B;
	Mon, 16 May 2011 23:20:13 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 205028FC13;
	Mon, 16 May 2011 23:20:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4GNKDbB003009;
	Mon, 16 May 2011 23:20:13 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4GNKCuN003005;
	Mon, 16 May 2011 23:20:12 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201105162320.p4GNKCuN003005@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 16 May 2011 23:20:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222001 - in head/sys: kern sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 May 2011 23:20:13 -0000

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 */