diff options
| author | alc <alc@FreeBSD.org> | 2013-05-31 16:00:42 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2013-05-31 16:00:42 +0000 |
| commit | 5c982b2ff7f71be82885b3ed65707e98b291a541 (patch) | |
| tree | d1b41a76e2f02245da776b8383a488ad481666b4 /sys/vm/vm_page.h | |
| parent | 4fce276969b1e39a7715c7704f755647e5a7bc3c (diff) | |
| download | FreeBSD-src-5c982b2ff7f71be82885b3ed65707e98b291a541.zip FreeBSD-src-5c982b2ff7f71be82885b3ed65707e98b291a541.tar.gz | |
Simplify the definition of vm_page_lock_assert(). There is no compelling
reason to inline the implementation of vm_page_lock_assert() in the
!KLD_MODULES case. Use the same implementation for both KLD_MODULES and
!KLD_MODULES.
Reviewed by: kib
Diffstat (limited to 'sys/vm/vm_page.h')
| -rw-r--r-- | sys/vm/vm_page.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index e240961..6179a6d 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -222,18 +222,17 @@ extern struct mtx_padalign pa_lock[]; #define vm_page_lock(m) vm_page_lock_KBI((m), LOCK_FILE, LOCK_LINE) #define vm_page_unlock(m) vm_page_unlock_KBI((m), LOCK_FILE, LOCK_LINE) #define vm_page_trylock(m) vm_page_trylock_KBI((m), LOCK_FILE, LOCK_LINE) -#if defined(INVARIANTS) -#define vm_page_lock_assert(m, a) \ - vm_page_lock_assert_KBI((m), (a), __FILE__, __LINE__) -#else -#define vm_page_lock_assert(m, a) -#endif #else /* !KLD_MODULE */ #define vm_page_lockptr(m) (PA_LOCKPTR(VM_PAGE_TO_PHYS((m)))) #define vm_page_lock(m) mtx_lock(vm_page_lockptr((m))) #define vm_page_unlock(m) mtx_unlock(vm_page_lockptr((m))) #define vm_page_trylock(m) mtx_trylock(vm_page_lockptr((m))) -#define vm_page_lock_assert(m, a) mtx_assert(vm_page_lockptr((m)), (a)) +#endif +#if defined(INVARIANTS) +#define vm_page_lock_assert(m, a) \ + vm_page_lock_assert_KBI((m), (a), __FILE__, __LINE__) +#else +#define vm_page_lock_assert(m, a) #endif /* |
