svn commit: r343058 - in head/sys: compat/linuxkpi/common/src vm

[Gleb Smirnoff]

Author: glebius
Date: Tue Jan 15 19:33:47 2019
New Revision: 343058
URL: https://svnweb.freebsd.org/changeset/base/343058

Log:
  Fix compilation failures on different arches that have vm_machdep.c not
  aware of counter_u64_t by including counter.h into uma_int.h. I'm not
  happy about this inclusion, but it fixes compilation ASAP.

Modified:
  head/sys/compat/linuxkpi/common/src/linux_page.c
  head/sys/vm/uma_dbg.c
  head/sys/vm/uma_int.h

Modified: head/sys/compat/linuxkpi/common/src/linux_page.c
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_page.c	Tue Jan 15 19:01:04 2019	(r343057)
+++ head/sys/compat/linuxkpi/common/src/linux_page.c	Tue Jan 15 19:33:47 2019	(r343058)
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/counter.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>

Modified: head/sys/vm/uma_dbg.c
==============================================================================
--- head/sys/vm/uma_dbg.c	Tue Jan 15 19:01:04 2019	(r343057)
+++ head/sys/vm/uma_dbg.c	Tue Jan 15 19:33:47 2019	(r343058)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bitset.h>
-#include <sys/counter.h>
 #include <sys/kernel.h>
 #include <sys/types.h>
 #include <sys/queue.h>

Modified: head/sys/vm/uma_int.h
==============================================================================
--- head/sys/vm/uma_int.h	Tue Jan 15 19:01:04 2019	(r343057)
+++ head/sys/vm/uma_int.h	Tue Jan 15 19:33:47 2019	(r343058)
@@ -30,6 +30,7 @@
  *
  */
 
+#include <sys/counter.h>
 #include <sys/_bitset.h>
 #include <sys/_domainset.h>
 #include <sys/_task.h>