summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2005-08-04 10:06:39 +0000
committerrwatson <rwatson@FreeBSD.org>2005-08-04 10:06:39 +0000
commit12d7b33401947e5b4b048a1df6c2516ba1eeccdf (patch)
tree89c757658c867b4e9ccde06dc08872c687a6ddd8
parent738048010904a58ab678318e90794fee8679ec5d (diff)
downloadFreeBSD-src-12d7b33401947e5b4b048a1df6c2516ba1eeccdf.zip
FreeBSD-src-12d7b33401947e5b4b048a1df6c2516ba1eeccdf.tar.gz
Define LIBMEMSTAT so that vm_page.h won't perform a nested include of
opt_vmpage.h. Remove definition of _KERNEL, it is no longer required in order to include uma_int.h, as the sensitive parts of uma_int.h (a number of inlines depending on kernel-only constants) are now protected by _KERNEL.
-rw-r--r--lib/libmemstat/memstat_uma.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/libmemstat/memstat_uma.c b/lib/libmemstat/memstat_uma.c
index 9572384..f091225 100644
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
@@ -29,17 +29,9 @@
#include <sys/param.h>
#include <sys/sysctl.h>
-/*
- * XXX: Grubbing around in UMA(9) using libkvm requires internal knowledge of
- * a number of VM-related bits. The ifdefs around those bits are not
- * designed with a nosy user-space consumer in mind.
- */
+#define LIBMEMSTAT /* Cause vm_page.h not to include opt_vmpage.h */
#include <vm/vm.h>
-#define _KERNEL /* XXX: vm_page.h confusion. */
-#define KLD_MODULE /* XXX: vm_page.h shouldn't include opt_vmpage.h. */
#include <vm/vm_page.h>
-#undef KLD_MODULE
-#undef _KERNEL
#include <vm/uma.h>
#include <vm/uma_int.h>
OpenPOWER on IntegriCloud