mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-28 16:43:09 +00:00
Code Issues Releases Activity

Partially revert r217515 so that the mem_range_softc variable is always

Browse Source 
present on x86 kernels.  This fixes the build of kernels that include
'device acpi' but do not include 'device mem'.

MFC after:	1 month
This commit is contained in:
John Baldwin 2012-07-09 20:42:08 +00:00
parent 7edc3d88eb
commit 5355f65974
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=238310
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/amd64/amd64/machdep.c
View File

@ -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

2
sys/amd64/amd64/mem.c
View File

@ -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)

3
sys/i386/i386/machdep.c
View File

@ -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;

2
sys/i386/i386/mem.c
View File

@ -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");

3
sys/pc98/pc98/machdep.c
View File

@ -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;