[Midnightbsd-cvs] src [7943] trunk/sys: Partially revert r217515 so that the mem_range_softc variable is always

[laffer1 at midnightbsd.org]

Revision: 7943
          http://svnweb.midnightbsd.org/src/?rev=7943
Author:   laffer1
Date:     2016-09-14 17:53:46 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
Partially revert r217515 so that the mem_range_softc variable is always
present on x86 kernels.  This fixes the build of kernels that include
'device acpi' but do not include 'device mem'.

Obtained from: FreeBSD

Revision Links:
--------------
    http://svnweb.midnightbsd.org/src/?rev=217515

Modified Paths:
--------------
    trunk/sys/amd64/amd64/machdep.c
    trunk/sys/amd64/amd64/mem.c
    trunk/sys/i386/i386/machdep.c
    trunk/sys/i386/i386/mem.c

Modified: trunk/sys/amd64/amd64/machdep.c
===================================================================
--- trunk/sys/amd64/amd64/machdep.c	2016-09-14 21:49:46 UTC (rev 7942)
+++ trunk/sys/amd64/amd64/machdep.c	2016-09-14 21:53:46 UTC (rev 7943)
@@ -74,6 +74,7 @@
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/memrange.h>
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
@@ -206,6 +207,8 @@
 
 struct mtx icu_lock;
 
+struct mem_range_softc mem_range_softc;
+
 struct mtx dt_lock;	/* lock for GDT and LDT */
 
 static void

Modified: trunk/sys/amd64/amd64/mem.c
===================================================================
--- trunk/sys/amd64/amd64/mem.c	2016-09-14 21:49:46 UTC (rev 7942)
+++ trunk/sys/amd64/amd64/mem.c	2016-09-14 21:53:46 UTC (rev 7943)
@@ -72,8 +72,6 @@
  */
 MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
 
-struct mem_range_softc mem_range_softc;
-
 /* ARGSUSED */
 int
 memrw(struct cdev *dev, struct uio *uio, int flags)

Modified: trunk/sys/i386/i386/machdep.c
===================================================================
--- trunk/sys/i386/i386/machdep.c	2016-09-14 21:49:46 UTC (rev 7942)
+++ trunk/sys/i386/i386/machdep.c	2016-09-14 21:53:46 UTC (rev 7943)
@@ -75,6 +75,7 @@
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/memrange.h>
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
@@ -247,6 +248,8 @@
 
 struct mtx icu_lock;
 
+struct mem_range_softc mem_range_softc;
+
 static void
 cpu_startup(dummy)
 	void *dummy;

Modified: trunk/sys/i386/i386/mem.c
===================================================================
--- trunk/sys/i386/i386/mem.c	2016-09-14 21:49:46 UTC (rev 7942)
+++ trunk/sys/i386/i386/mem.c	2016-09-14 21:53:46 UTC (rev 7943)
@@ -72,8 +72,6 @@
  */
 MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
 
-struct mem_range_softc mem_range_softc;
-
 static struct sx memsxlock;
 SX_SYSINIT(memsxlockinit, &memsxlock, "/dev/mem lock");