summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/acpica/acpi.c1
-rw-r--r--sys/i386/i386/nexus.c1
-rw-r--r--sys/kern/subr_bus.c1
-rw-r--r--sys/kern/subr_rman.c1
-rw-r--r--sys/sys/rman.h6
5 files changed, 10 insertions, 0 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index e7ffbe7..97540bb 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -29,6 +29,7 @@
* $FreeBSD$
*/
+#define __RMAN_RESOURCE_VISIBLE
#include "opt_acpi.h"
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index 3812c0a..6c72129 100644
--- a/sys/i386/i386/nexus.c
+++ b/sys/i386/i386/nexus.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include "opt_isa.h"
+#define __RMAN_RESOURCE_VISIBLE
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index cff6e7f..8c8b799 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
#include "opt_bus.h"
+#define __RMAN_RESOURCE_VISIBLE
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/filio.h>
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index 754695b..5eb4bc2 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -58,6 +58,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#define __RMAN_RESOURCE_VISIBLE
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index 68dd1bd..d3af804 100644
--- a/sys/sys/rman.h
+++ b/sys/sys/rman.h
@@ -93,6 +93,7 @@ struct u_rman {
* at some point in the future, particularly if we want to support 36-bit
* addresses on IA32 hardware.
*/
+#ifdef __RMAN_RESOURCE_VISIBLE
TAILQ_HEAD(resource_head, resource);
struct resource {
TAILQ_ENTRY(resource) r_link;
@@ -119,6 +120,11 @@ struct rman {
const char *rm_descr; /* text descripion of this resource */
};
TAILQ_HEAD(rman_head, rman);
+#else
+struct resource;
+struct rman;
+struct device;
+#endif
int rman_activate_resource(struct resource *r);
int rman_await_resource(struct resource *r, int pri, int timo);
OpenPOWER on IntegriCloud