From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 31 15:53:55 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1A33E1065675;
	Tue, 31 Jan 2012 15:53:55 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 097C68FC0A;
	Tue, 31 Jan 2012 15:53:55 +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 q0VFrsmI043360;
	Tue, 31 Jan 2012 15:53:54 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0VFrsGe043358;
	Tue, 31 Jan 2012 15:53:54 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201311553.q0VFrsGe043358@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Tue, 31 Jan 2012 15:53:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230827 - projects/armv6/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jan 2012 15:53:55 -0000

Author: gber
Date: Tue Jan 31 15:53:54 2012
New Revision: 230827
URL: http://svn.freebsd.org/changeset/base/230827

Log:
  Properly update mp_naps and smp_cpus.
  
  Obtained from: Marvell, Semihalf

Modified:
  projects/armv6/sys/arm/arm/mp_machdep.c

Modified: projects/armv6/sys/arm/arm/mp_machdep.c
==============================================================================
--- projects/armv6/sys/arm/arm/mp_machdep.c	Tue Jan 31 15:53:11 2012	(r230826)
+++ projects/armv6/sys/arm/arm/mp_machdep.c	Tue Jan 31 15:53:54 2012	(r230827)
@@ -145,12 +145,11 @@ init_secondary(int cpu)
 	set_stackptrs(cpu);
 
 	/* Signal our startup to BSP */
-	mp_naps++;
-	cpu_dcache_wbinv_all();
+	atomic_add_rel_32(&mp_naps, 1);
 
 	/* Spin until the BSP releases the APs */
 	while (!aps_ready)
-		cpu_dcache_wbinv_all();
+		;
 
 	/* Initialize curthread */
 	KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread"));
@@ -159,7 +158,7 @@ init_secondary(int cpu)
 
 	mtx_lock_spin(&ap_boot_mtx);
 
-	atomic_store_rel_int(&smp_cpus, 1);
+	atomic_add_rel_32(&smp_cpus, 1);
 
 	if (smp_cpus == mp_ncpus) {
 		/* enable IPI's, tlb shootdown, freezes etc */