Deleted Added
full compact
memstat_uma.c (148627) memstat_uma.c (148693)
1/*-
2 * Copyright (c) 2005 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2005 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/lib/libmemstat/memstat_uma.c 148627 2005-08-01 19:07:39Z rwatson $
26 * $FreeBSD: head/lib/libmemstat/memstat_uma.c 148693 2005-08-04 10:06:39Z rwatson $
27 */
28
29#include <sys/param.h>
30#include <sys/sysctl.h>
31
27 */
28
29#include <sys/param.h>
30#include <sys/sysctl.h>
31
32/*
33 * XXX: Grubbing around in UMA(9) using libkvm requires internal knowledge of
34 * a number of VM-related bits. The ifdefs around those bits are not
35 * designed with a nosy user-space consumer in mind.
36 */
32#define LIBMEMSTAT /* Cause vm_page.h not to include opt_vmpage.h */
37#include <vm/vm.h>
33#include <vm/vm.h>
38#define _KERNEL /* XXX: vm_page.h confusion. */
39#define KLD_MODULE /* XXX: vm_page.h shouldn't include opt_vmpage.h. */
40#include <vm/vm_page.h>
34#include <vm/vm_page.h>
41#undef KLD_MODULE
42#undef _KERNEL
43
44#include <vm/uma.h>
45#include <vm/uma_int.h>
46
47#include <err.h>
48#include <errno.h>
49#include <kvm.h>
50#include <nlist.h>

--- 393 unchanged lines hidden ---
35
36#include <vm/uma.h>
37#include <vm/uma_int.h>
38
39#include <err.h>
40#include <errno.h>
41#include <kvm.h>
42#include <nlist.h>

--- 393 unchanged lines hidden ---