diff --git a/[refs] b/[refs] index d0aae119b8eb..c7f51879a814 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f649e9388cd46ad1634164e56f96ae092ca59e4a +refs/heads/master: 4ebc1b4b0004b45e280940db81888a7863d3a01d diff --git a/trunk/include/linux/spinlock.h b/trunk/include/linux/spinlock.h index 7df6c17b0281..363239087263 100644 --- a/trunk/include/linux/spinlock.h +++ b/trunk/include/linux/spinlock.h @@ -375,10 +375,7 @@ static inline int spin_can_lock(spinlock_t *lock) return raw_spin_can_lock(&lock->rlock); } -static inline void assert_spin_locked(spinlock_t *lock) -{ - assert_raw_spin_locked(&lock->rlock); -} +#define assert_spin_locked(lock) assert_raw_spin_locked(&(lock)->rlock) /* * Pull the atomic_t declaration: