From fb20c6fee6baf0d773d72b8e0a63489e2e7cb188 Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Mon, 9 Jul 2012 20:42:08 +0000
Subject: 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'.

MFC after:	1 month
---
 sys/amd64/amd64/machdep.c | 3 +++
 sys/amd64/amd64/mem.c     | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'sys/amd64')

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 9580d79..8044fe5 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 #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 pcpu __pcpu[MAXCPU];
 
 struct mtx icu_lock;
 
+struct mem_range_softc mem_range_softc;
+
 struct mtx dt_lock;	/* lock for GDT and LDT */
 
 static void
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index b86f5dd..abbbb21 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -72,8 +72,6 @@ __FBSDID("$FreeBSD$");
  */
 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)
-- 
cgit v1.1