From owner-svn-src-stable@freebsd.org  Tue Nov 22 18:43:06 2016
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64EB0C4FA65;
 Tue, 22 Nov 2016 18:43:06 +0000 (UTC) (envelope-from jhb@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 mx1.freebsd.org (Postfix) with ESMTPS id 34EB81C08;
 Tue, 22 Nov 2016 18:43:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAMIh5vI085190;
 Tue, 22 Nov 2016 18:43:05 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAMIh5iu085186;
 Tue, 22 Nov 2016 18:43:05 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201611221843.uAMIh5iu085186@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 22 Nov 2016 18:43:05 +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: r309020 - stable/11/sys/amd64/include
X-SVN-Group: stable-11
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.23
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: Tue, 22 Nov 2016 18:43:06 -0000

Author: jhb
Date: Tue Nov 22 18:43:04 2016
New Revision: 309020
URL: https://svnweb.freebsd.org/changeset/base/309020

Log:
  MFC 308142: Move declarations of invpcid_works and pmap_pcid_enabled to pmap.h.
  
  Previously these were only declared under #ifdef SMP in <machine/smp.h>.
  However, these variables are defind in pmap.c unconditionally, and efirt.c
  references them unconditionally.  This fixes non-SMP kernel builds.

Modified:
  stable/11/sys/amd64/include/pmap.h
  stable/11/sys/amd64/include/smp.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/include/pmap.h
==============================================================================
--- stable/11/sys/amd64/include/pmap.h	Tue Nov 22 18:32:20 2016	(r309019)
+++ stable/11/sys/amd64/include/pmap.h	Tue Nov 22 18:43:04 2016	(r309020)
@@ -382,6 +382,8 @@ extern vm_paddr_t dump_avail[];
 extern vm_offset_t virtual_avail;
 extern vm_offset_t virtual_end;
 extern vm_paddr_t dmaplimit;
+extern int pmap_pcid_enabled;
+extern int invpcid_works;
 
 #define	pmap_page_get_memattr(m)	((vm_memattr_t)(m)->md.pat_mode)
 #define	pmap_page_is_write_mapped(m)	(((m)->aflags & PGA_WRITEABLE) != 0)

Modified: stable/11/sys/amd64/include/smp.h
==============================================================================
--- stable/11/sys/amd64/include/smp.h	Tue Nov 22 18:32:20 2016	(r309019)
+++ stable/11/sys/amd64/include/smp.h	Tue Nov 22 18:43:04 2016	(r309020)
@@ -21,9 +21,6 @@
 
 #include <x86/x86_smp.h>
 
-extern int pmap_pcid_enabled;
-extern int invpcid_works;
-
 /* global symbols in mpboot.S */
 extern char			mptramp_start[];
 extern char			mptramp_end[];