From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 23 21:54:05 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45B121065672;
	Thu, 23 Feb 2012 21:54:05 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 348338FC16;
	Thu, 23 Feb 2012 21:54:05 +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 q1NLs50U024920;
	Thu, 23 Feb 2012 21:54:05 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1NLs5Tk024918;
	Thu, 23 Feb 2012 21:54:05 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201202232154.q1NLs5Tk024918@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 23 Feb 2012 21:54:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232079 - stable/9/sys/amd64/amd64
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 23 Feb 2012 21:54:05 -0000

Author: jkim
Date: Thu Feb 23 21:54:04 2012
New Revision: 232079
URL: http://svn.freebsd.org/changeset/base/232079

Log:
  MFC:	r231169
  
  Do not EOI local APIC too early when suspending APs.  Just do doreti instead
  of taking a shortcut.

Modified:
  stable/9/sys/amd64/amd64/apic_vector.S
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/amd64/apic_vector.S
==============================================================================
--- stable/9/sys/amd64/amd64/apic_vector.S	Thu Feb 23 21:50:13 2012	(r232078)
+++ stable/9/sys/amd64/amd64/apic_vector.S	Thu Feb 23 21:54:04 2012	(r232079)
@@ -300,13 +300,10 @@ IDTVEC(cpustop)
 IDTVEC(cpususpend)
 	PUSH_FRAME
 
+	call	cpususpend_handler
 	movq	lapic, %rax
 	movl	$0, LA_EOI(%rax)	/* End Of Interrupt to APIC */
-
-	call	cpususpend_handler
-
-	POP_FRAME
-	jmp	doreti_iret
+	jmp	doreti
 
 /*
  * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU.