diff options
| author | alc <alc@FreeBSD.org> | 2004-06-04 04:03:26 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2004-06-04 04:03:26 +0000 |
| commit | b5cd9ba03c2309de3b6b2eb7f8526d7c55a0e706 (patch) | |
| tree | 2d81df657ced60192e9660e00659dc4cedbba139 | |
| parent | 958eff641bf391ef0a040906ec30c871812f9f93 (diff) | |
| download | FreeBSD-src-b5cd9ba03c2309de3b6b2eb7f8526d7c55a0e706.zip FreeBSD-src-b5cd9ba03c2309de3b6b2eb7f8526d7c55a0e706.tar.gz | |
Move the definitions of SWAPBLK_NONE and SWAPBLK_MASK from vm_page.h to
blist.h, enabling the removal of numerous #includes from subr_blist.c.
(subr_blist.c and swap_pager.c are the only users of these definitions.)
| -rw-r--r-- | sys/kern/subr_blist.c | 5 | ||||
| -rw-r--r-- | sys/sys/blist.h | 8 | ||||
| -rw-r--r-- | sys/vm/vm_page.h | 8 |
3 files changed, 8 insertions, 13 deletions
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c index e8193d2..2c83499 100644 --- a/sys/kern/subr_blist.c +++ b/sys/kern/subr_blist.c @@ -96,11 +96,6 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/proc.h> #include <sys/mutex.h> -#include <vm/vm.h> -#include <vm/vm_object.h> -#include <vm/vm_kern.h> -#include <vm/vm_extern.h> -#include <vm/vm_page.h> #else diff --git a/sys/sys/blist.h b/sys/sys/blist.h index 8cda0c0..e1d8fff 100644 --- a/sys/sys/blist.h +++ b/sys/sys/blist.h @@ -56,6 +56,14 @@ typedef u_int32_t u_daddr_t; /* unsigned disk address */ /* + * note: currently use SWAPBLK_NONE as an absolute value rather then + * a flag bit. + */ + +#define SWAPBLK_MASK ((daddr_t)((u_daddr_t)-1 >> 1)) /* mask */ +#define SWAPBLK_NONE ((daddr_t)((u_daddr_t)SWAPBLK_MASK + 1))/* flag */ + +/* * blmeta and bl_bitmap_t MUST be a power of 2 in size. */ diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index b1b194a..4c2d211 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -146,14 +146,6 @@ CTASSERT(sizeof(u_long) >= 8); #endif #endif -/* - * note: currently use SWAPBLK_NONE as an absolute value rather then - * a flag bit. - */ - -#define SWAPBLK_MASK ((daddr_t)((u_daddr_t)-1 >> 1)) /* mask */ -#define SWAPBLK_NONE ((daddr_t)((u_daddr_t)SWAPBLK_MASK + 1))/* flag */ - #if !defined(KLD_MODULE) /* * Page coloring parameters |
