Author: jhb
Date: Wed Aug 29 20:49:36 2012
New Revision: 239880
URL: http://svn.freebsd.org/changeset/base/239880
Log:
MFC 238310:
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'.
Modified:
stable/9/sys/amd64/amd64/machdep.c
stable/9/sys/amd64/amd64/mem.c
stable/9/sys/i386/i386/machdep.c
stable/9/sys/i386/i386/mem.c
stable/9/sys/pc98/pc98/machdep.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/isp/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/9/sys/amd64/amd64/machdep.c Wed Aug 29 19:47:19 2012
(r239879)
+++ stable/9/sys/amd64/amd64/machdep.c Wed Aug 29 20:49:36 2012
(r239880)
@@ -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
Modified: stable/9/sys/amd64/amd64/mem.c
==============================================================================
--- stable/9/sys/amd64/amd64/mem.c Wed Aug 29 19:47:19 2012
(r239879)
+++ stable/9/sys/amd64/amd64/mem.c Wed Aug 29 20:49:36 2012
(r239880)
@@ -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)
Modified: stable/9/sys/i386/i386/machdep.c
==============================================================================
--- stable/9/sys/i386/i386/machdep.c Wed Aug 29 19:47:19 2012
(r239879)
+++ stable/9/sys/i386/i386/machdep.c Wed Aug 29 20:49:36 2012
(r239880)
@@ -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;
Modified: stable/9/sys/i386/i386/mem.c
==============================================================================
--- stable/9/sys/i386/i386/mem.c Wed Aug 29 19:47:19 2012
(r239879)
+++ stable/9/sys/i386/i386/mem.c Wed Aug 29 20:49:36 2012
(r239880)
@@ -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");
Modified: stable/9/sys/pc98/pc98/machdep.c
==============================================================================
--- stable/9/sys/pc98/pc98/machdep.c Wed Aug 29 19:47:19 2012
(r239879)
+++ stable/9/sys/pc98/pc98/machdep.c Wed Aug 29 20:49:36 2012
(r239880)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
