svn commit: r309020 - stable/11/sys/amd64/include

[John Baldwin]

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[];