From owner-svn-src-all@freebsd.org  Sun Oct 21 02:08:58 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FC7FFFFDA7;
 Sun, 21 Oct 2018 02:08:58 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E9294756CF;
 Sun, 21 Oct 2018 02:08:57 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E350A26DA7;
 Sun, 21 Oct 2018 02:08:57 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9L28vmF080089;
 Sun, 21 Oct 2018 02:08:57 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9L28vVc080088;
 Sun, 21 Oct 2018 02:08:57 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201810210208.w9L28vVc080088@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Sun, 21 Oct 2018 02:08:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r339516 - head/sys/cddl/dev/dtrace/powerpc
X-SVN-Group: head
X-SVN-Commit-Author: jhibbits
X-SVN-Commit-Paths: head/sys/cddl/dev/dtrace/powerpc
X-SVN-Commit-Revision: 339516
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Oct 2018 02:08:58 -0000

Author: jhibbits
Date: Sun Oct 21 02:08:57 2018
New Revision: 339516
URL: https://svnweb.freebsd.org/changeset/base/339516

Log:
  powerpc/dtrace: Use explicit bit numbers to mask out PSL_EE
  
  There seems to be a race in CI, such that dtrace_asm.S might be assembled
  before the genassym is completed.  This causes a build failure when PSL_EE
  doesn't exist, and is read as 0.  Get around this by explicitly specifying
  the bits in the mask instead.

Modified:
  head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S

Modified: head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
==============================================================================
--- head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S	Sun Oct 21 00:48:38 2018	(r339515)
+++ head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S	Sun Oct 21 02:08:57 2018	(r339516)
@@ -72,7 +72,7 @@ ASENTRY_NOPROF(dtrace_interrupt_disable)
 	rldicl	%r0,%r3,48,1
 	rotldi	%r0,%r0,16
 #else
-	rlwinm	%r0,%r3,0,~PSL_EE /* Clear EE flag */
+	rlwinm	%r0,%r3,0,17,15 /* Clear EE flag */
 #endif
 	mtmsr	%r0
 	blr