diff options
| author | attilio <attilio@FreeBSD.org> | 2009-08-17 16:17:21 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2009-08-17 16:17:21 +0000 |
| commit | e75d30c87f88cc8122139e051639281f766a20ed (patch) | |
| tree | c287450b66e6c82a706049a48c5fcff40a6bc3b5 /sys/kern/kern_lock.c | |
| parent | 61d6cdbea1c290b707b3e593b66d13469c3be675 (diff) | |
| download | FreeBSD-src-e75d30c87f88cc8122139e051639281f766a20ed.zip FreeBSD-src-e75d30c87f88cc8122139e051639281f766a20ed.tar.gz | |
* Change the scope of the ASSERT_ATOMIC_LOAD() from a generic check to
a pointer-fetching specific operation check. Consequently, rename the
operation ASSERT_ATOMIC_LOAD_PTR().
* Fix the implementation of ASSERT_ATOMIC_LOAD_PTR() by checking
directly alignment on the word boundry, for all the given specific
architectures. That's a bit too strict for some common case, but it
assures safety.
* Add a comment explaining the scope of the macro
* Add a new stub in the lockmgr specific implementation
Tested by: marcel (initial version), marius
Reviewed by: rwatson, jhb (comment specific review)
Approved by: re (kib)
Diffstat (limited to 'sys/kern/kern_lock.c')
| -rw-r--r-- | sys/kern/kern_lock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 0affad5..29ae4ac 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -334,6 +334,9 @@ lockinit(struct lock *lk, int pri, const char *wmesg, int timo, int flags) int iflags; MPASS((flags & ~LK_INIT_MASK) == 0); + ASSERT_ATOMIC_LOAD_PTR(lk->lk_lock, + ("%s: lockmgr not aligned for %s: %p", __func__, wmesg, + &lk->lk_lock)); iflags = LO_SLEEPABLE | LO_UPGRADABLE; if (flags & LK_CANRECURSE) |
