svn commit: r331370 - in user/jeff/numa/sys: kern sys vm x86/x86

[Jeff Roberson]

Author: jeff
Date: Thu Mar 22 19:23:02 2018
New Revision: 331370
URL: https://svnweb.freebsd.org/changeset/base/331370

Log:
  Attempt to improve the include situation for vm_ndomains.

Modified:
  user/jeff/numa/sys/kern/kern_cpuset.c
  user/jeff/numa/sys/sys/smp.h
  user/jeff/numa/sys/vm/vm_extern.h
  user/jeff/numa/sys/vm/vm_phys.h
  user/jeff/numa/sys/x86/x86/intr_machdep.c

Modified: user/jeff/numa/sys/kern/kern_cpuset.c
==============================================================================
--- user/jeff/numa/sys/kern/kern_cpuset.c	Thu Mar 22 19:21:11 2018	(r331369)
+++ user/jeff/numa/sys/kern/kern_cpuset.c	Thu Mar 22 19:23:02 2018	(r331370)
@@ -65,9 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 #include <vm/vm.h>
 #include <vm/vm_object.h>
-#include <vm/vm_page.h>
-#include <vm/vm_param.h>
-#include <vm/vm_phys.h>
+#include <vm/vm_extern.h>
 
 #ifdef DDB
 #include <ddb/ddb.h>

Modified: user/jeff/numa/sys/sys/smp.h
==============================================================================
--- user/jeff/numa/sys/sys/smp.h	Thu Mar 22 19:21:11 2018	(r331369)
+++ user/jeff/numa/sys/sys/smp.h	Thu Mar 22 19:23:02 2018	(r331370)
@@ -169,7 +169,6 @@ extern u_int mp_maxid;
 extern int mp_maxcpus;
 extern int mp_ncpus;
 extern volatile int smp_started;
-extern int vm_ndomains;
 
 extern cpuset_t all_cpus;
 extern cpuset_t cpuset_domain[MAXMEMDOM]; 	/* CPUs in each NUMA domain. */

Modified: user/jeff/numa/sys/vm/vm_extern.h
==============================================================================
--- user/jeff/numa/sys/vm/vm_extern.h	Thu Mar 22 19:21:11 2018	(r331369)
+++ user/jeff/numa/sys/vm/vm_extern.h	Thu Mar 22 19:23:02 2018	(r331370)
@@ -45,6 +45,8 @@ struct vmem;
 struct cdev;
 struct cdevsw;
 
+extern int vm_ndomains;
+
 /* These operate on kernel virtual addresses only. */
 vm_offset_t kva_alloc(vm_size_t);
 void kva_free(vm_offset_t, vm_size_t);

Modified: user/jeff/numa/sys/vm/vm_phys.h
==============================================================================
--- user/jeff/numa/sys/vm/vm_phys.h	Thu Mar 22 19:21:11 2018	(r331369)
+++ user/jeff/numa/sys/vm/vm_phys.h	Thu Mar 22 19:23:02 2018	(r331370)
@@ -52,7 +52,6 @@ struct mem_affinity {
 extern struct mem_affinity *mem_affinity;
 extern int *mem_locality;
 #endif
-extern int vm_ndomains;
 
 struct vm_freelist {
 	struct pglist pl;

Modified: user/jeff/numa/sys/x86/x86/intr_machdep.c
==============================================================================
--- user/jeff/numa/sys/x86/x86/intr_machdep.c	Thu Mar 22 19:21:11 2018	(r331369)
+++ user/jeff/numa/sys/x86/x86/intr_machdep.c	Thu Mar 22 19:23:02 2018	(r331370)
@@ -71,6 +71,9 @@
 #include <isa/isareg.h>
 #endif
 
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+
 #define	MAX_STRAY_LOG	5
 
 typedef void (*mask_fn)(void *);