From owner-svn-src-head@freebsd.org  Tue Sep 22 16:46:35 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B216FA07392;
 Tue, 22 Sep 2015 16:46:35 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A33771984;
 Tue, 22 Sep 2015 16:46:35 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8MGkZGZ031634;
 Tue, 22 Sep 2015 16:46:35 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8MGkZ9n031633;
 Tue, 22 Sep 2015 16:46:35 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201509221646.t8MGkZ9n031633@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 22 Sep 2015 16:46:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288117 - head/sys/arm64/arm64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Sep 2015 16:46:35 -0000

Author: andrew
Date: Tue Sep 22 16:46:34 2015
New Revision: 288117
URL: https://svnweb.freebsd.org/changeset/base/288117

Log:
  Don't restore interrupts when we are about to disable them in the next
  instruction.

Modified:
  head/sys/arm64/arm64/exception.S

Modified: head/sys/arm64/arm64/exception.S
==============================================================================
--- head/sys/arm64/arm64/exception.S	Tue Sep 22 16:35:32 2015	(r288116)
+++ head/sys/arm64/arm64/exception.S	Tue Sep 22 16:46:34 2015	(r288117)
@@ -123,10 +123,7 @@ __FBSDID("$FreeBSD$");
 
 	/* Re-check for new ast scheduled */
 	b	1b
-
 2:
-	/* Restore interrupts */
-	msr	daif, x19
 .endm
 
 handle_el1h_sync: