diff options
| author | jhb <jhb@FreeBSD.org> | 2012-07-09 20:42:08 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2012-07-09 20:42:08 +0000 |
| commit | fb20c6fee6baf0d773d72b8e0a63489e2e7cb188 (patch) | |
| tree | cd61c7e18b106d96f8d6dae36d79a742cee193c5 | |
| parent | f5f1e197556558f5b7ecb769aca02ec45c179e82 (diff) | |
| download | FreeBSD-src-fb20c6fee6baf0d773d72b8e0a63489e2e7cb188.zip FreeBSD-src-fb20c6fee6baf0d773d72b8e0a63489e2e7cb188.tar.gz | |
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
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 3 | ||||
| -rw-r--r-- | sys/amd64/amd64/mem.c | 2 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 3 | ||||
| -rw-r--r-- | sys/i386/i386/mem.c | 2 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 3 |
5 files changed, 9 insertions, 4 deletions
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) diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index de105f0..40c8c46 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -75,6 +75,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> @@ -247,6 +248,8 @@ struct pcpu __pcpu[MAXCPU]; struct mtx icu_lock; +struct mem_range_softc mem_range_softc; + static void cpu_startup(dummy) void *dummy; diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index dbbe242f..9c83f47 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -72,8 +72,6 @@ __FBSDID("$FreeBSD$"); */ 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"); diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 88b1f20..38b7a28 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -73,6 +73,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> @@ -216,6 +217,8 @@ struct pcpu __pcpu[MAXCPU]; struct mtx icu_lock; +struct mem_range_softc mem_range_softc; + static void cpu_startup(dummy) void *dummy; |
