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.
This commit is contained in:
parent
7380480109
commit
12d7b33401
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user