From owner-svn-src-head@freebsd.org  Tue Mar 20 21:16:27 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D3A6F4AEBB;
 Tue, 20 Mar 2018 21:16:27 +0000 (UTC)
 (envelope-from markj@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 B00CA684E4;
 Tue, 20 Mar 2018 21:16:26 +0000 (UTC)
 (envelope-from markj@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 A63B421F9A;
 Tue, 20 Mar 2018 21:16:26 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2KLGQqC061168;
 Tue, 20 Mar 2018 21:16:26 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2KLGQsF061167;
 Tue, 20 Mar 2018 21:16:26 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201803202116.w2KLGQsF061167@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 20 Mar 2018 21:16:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r331264 - head/sys/cddl/dev/fbt/x86
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/cddl/dev/fbt/x86
X-SVN-Commit-Revision: 331264
X-SVN-Commit-Repository: base
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.25
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, 20 Mar 2018 21:16:27 -0000

Author: markj
Date: Tue Mar 20 21:16:26 2018
New Revision: 331264
URL: https://svnweb.freebsd.org/changeset/base/331264

Log:
  Make use of the KPI added in r331252.
  
  MFC after:	2 weeks

Modified:
  head/sys/cddl/dev/fbt/x86/fbt_isa.c

Modified: head/sys/cddl/dev/fbt/x86/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/x86/fbt_isa.c	Tue Mar 20 21:04:47 2018	(r331263)
+++ head/sys/cddl/dev/fbt/x86/fbt_isa.c	Tue Mar 20 21:16:26 2018	(r331264)
@@ -35,6 +35,7 @@
 #include <sys/dtrace.h>
 
 #include <machine/cpufunc.h>
+#include <machine/md_var.h>
 
 #include "fbt.h"
 
@@ -145,15 +146,11 @@ fbt_invop(uintptr_t addr, struct trapframe *frame, uin
 void
 fbt_patch_tracepoint(fbt_probe_t *fbt, fbt_patchval_t val)
 {
-	u_long cr0save;
-	register_t intr;
+	bool old_wp;
 
-	intr = intr_disable();
-	cr0save = rcr0();
-	load_cr0(cr0save & ~CR0_WP);
+	old_wp = disable_wp();
 	*fbt->fbtp_patchpoint = val;
-	load_cr0(cr0save);
-	intr_restore(intr);
+	restore_wp(old_wp);
 }
 
 int