From owner-svn-src-stable@freebsd.org  Thu Apr 19 15:11:19 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 2173DF82561;
 Thu, 19 Apr 2018 15:11:19 +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 BFE26680D7;
 Thu, 19 Apr 2018 15:11:18 +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 BA4CA336B;
 Thu, 19 Apr 2018 15:11:18 +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 w3JFBIk2054334;
 Thu, 19 Apr 2018 15:11:18 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3JFBI3e054333;
 Thu, 19 Apr 2018 15:11:18 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201804191511.w3JFBI3e054333@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: Thu, 19 Apr 2018 15:11:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r332777 - stable/11/sys/compat/linuxkpi/common/include/asm
X-SVN-Group: stable-11
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: stable/11/sys/compat/linuxkpi/common/include/asm
X-SVN-Commit-Revision: 332777
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2018 15:11:19 -0000

Author: markj
Date: Thu Apr 19 15:11:18 2018
New Revision: 332777
URL: https://svnweb.freebsd.org/changeset/base/332777

Log:
  MFC r332079:
  Fix the definitions of get_cpu() and put_cpu().

Modified:
  stable/11/sys/compat/linuxkpi/common/include/asm/smp.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linuxkpi/common/include/asm/smp.h
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/include/asm/smp.h	Thu Apr 19 15:10:42 2018	(r332776)
+++ stable/11/sys/compat/linuxkpi/common/include/asm/smp.h	Thu Apr 19 15:11:18 2018	(r332777)
@@ -38,11 +38,11 @@ int	linux_wbinvd_on_all_cpus(void);
 #endif
 
 #define	get_cpu() ({			\
-	sched_pin();			\
+	critical_enter();		\
 	PCPU_GET(cpuid);		\
 })
 
 #define	put_cpu()			\
-	sched_unpin()
+	critical_exit()
 
 #endif /* _ASM_SMP_H_ */