From owner-svn-src-stable@FreeBSD.ORG  Wed Mar  6 09:33:17 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 838712CB;
 Wed,  6 Mar 2013 09:33:17 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 769ACD64;
 Wed,  6 Mar 2013 09:33:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r269XH8v057308;
 Wed, 6 Mar 2013 09:33:17 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r269XHnE057307;
 Wed, 6 Mar 2013 09:33:17 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201303060933.r269XHnE057307@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 6 Mar 2013 09:33:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r247879 - stable/8/sys/amd64/amd64
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2013 09:33:17 -0000

Author: avg
Date: Wed Mar  6 09:33:16 2013
New Revision: 247879
URL: http://svnweb.freebsd.org/changeset/base/247879

Log:
  MFC r246248: cpususpend_handler: mark AP as resumed only after fully
  setting up lapic

Modified:
  stable/8/sys/amd64/amd64/mp_machdep.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/   (props changed)

Modified: stable/8/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- stable/8/sys/amd64/amd64/mp_machdep.c	Wed Mar  6 09:33:04 2013	(r247878)
+++ stable/8/sys/amd64/amd64/mp_machdep.c	Wed Mar  6 09:33:16 2013	(r247879)
@@ -1365,13 +1365,14 @@ cpususpend_handler(void)
 	while (!(started_cpus & cpumask))
 		ia32_pause();
 
-	atomic_clear_int(&started_cpus, cpumask);
-	atomic_clear_int(&stopped_cpus, cpumask);
-
 	/* Restore CR3 and enable interrupts */
 	load_cr3(cr3);
 	mca_resume();
 	lapic_setup(0);
+
+	atomic_clear_int(&started_cpus, cpumask);
+	atomic_clear_int(&stopped_cpus, cpumask);
+
 	intr_restore(rf);
 }