Merge tag 'devicetree-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / lib / test_lockup.c

diff --git a/lib/test_lockup.c b/lib/test_lockup.c
index 864554e..906b598 100644 (file)
--- a/lib/test_lockup.c
+++ b/lib/test_lockup.c
@@ -485,13 +485,13 @@ static int __init test_lockup_init(void)
                       offsetof(spinlock_t, lock.wait_lock.magic),
                       SPINLOCK_MAGIC) ||
            test_magic(lock_rwlock_ptr,
-                      offsetof(rwlock_t, rtmutex.wait_lock.magic),
+                      offsetof(rwlock_t, rwbase.rtmutex.wait_lock.magic),
                       SPINLOCK_MAGIC) ||
            test_magic(lock_mutex_ptr,
-                      offsetof(struct mutex, lock.wait_lock.magic),
+                      offsetof(struct mutex, rtmutex.wait_lock.magic),
                       SPINLOCK_MAGIC) ||
            test_magic(lock_rwsem_ptr,
-                      offsetof(struct rw_semaphore, rtmutex.wait_lock.magic),
+                      offsetof(struct rw_semaphore, rwbase.rtmutex.wait_lock.magic),
                       SPINLOCK_MAGIC))
                return -EINVAL;
 #else
@@ -502,7 +502,7 @@ static int __init test_lockup_init(void)
                       offsetof(rwlock_t, magic),
                       RWLOCK_MAGIC) ||
            test_magic(lock_mutex_ptr,
-                      offsetof(struct mutex, wait_lock.rlock.magic),
+                      offsetof(struct mutex, wait_lock.magic),
                       SPINLOCK_MAGIC) ||
            test_magic(lock_rwsem_ptr,
                       offsetof(struct rw_semaphore, wait_lock.magic),