net: qede: convert to SPDX License Identifiers

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

diff --git a/lib/test_lockup.c b/lib/test_lockup.c
index 419fbac..bd7c7ff 100644 (file)
--- a/lib/test_lockup.c
+++ b/lib/test_lockup.c
@@ -103,7 +103,7 @@ MODULE_PARM_DESC(lock_rcu, "grab rcu_read_lock: generate rcu stalls");
 
 static bool lock_mmap_sem;
 module_param(lock_mmap_sem, bool, 0400);
-MODULE_PARM_DESC(lock_mmap_sem, "lock mm->mmap_sem: block procfs interfaces");
+MODULE_PARM_DESC(lock_mmap_sem, "lock mm->mmap_lock: block procfs interfaces");
 
 static unsigned long lock_rwsem_ptr;
 module_param_unsafe(lock_rwsem_ptr, ulong, 0400);
@@ -191,11 +191,11 @@ static void test_lock(bool master, bool verbose)
 
        if (lock_mmap_sem && master) {
                if (verbose)
-                       pr_notice("lock mmap_sem pid=%d\n", main_task->pid);
+                       pr_notice("lock mmap_lock pid=%d\n", main_task->pid);
                if (lock_read)
-                       down_read(&main_task->mm->mmap_sem);
+                       mmap_read_lock(main_task->mm);
                else
-                       down_write(&main_task->mm->mmap_sem);
+                       mmap_write_lock(main_task->mm);
        }
 
        if (test_disable_irq)
@@ -276,11 +276,11 @@ static void test_unlock(bool master, bool verbose)
 
        if (lock_mmap_sem && master) {
                if (lock_read)
-                       up_read(&main_task->mm->mmap_sem);
+                       mmap_read_unlock(main_task->mm);
                else
-                       up_write(&main_task->mm->mmap_sem);
+                       mmap_write_unlock(main_task->mm);
                if (verbose)
-                       pr_notice("unlock mmap_sem pid=%d\n", main_task->pid);
+                       pr_notice("unlock mmap_lock pid=%d\n", main_task->pid);
        }
 
        if (lock_rwsem_ptr && master) {
@@ -419,8 +419,8 @@ static bool test_kernel_ptr(unsigned long addr, int size)
        /* should be at least readable kernel address */
        if (access_ok(ptr, 1) ||
            access_ok(ptr + size - 1, 1) ||
-           probe_kernel_address(ptr, buf) ||
-           probe_kernel_address(ptr + size - 1, buf)) {
+           get_kernel_nofault(buf, ptr) ||
+           get_kernel_nofault(buf, ptr + size - 1)) {
                pr_err("invalid kernel ptr: %#lx\n", addr);
                return true;
        }
@@ -437,7 +437,7 @@ static bool __maybe_unused test_magic(unsigned long addr, int offset,
        if (!addr)
                return false;
 
-       if (probe_kernel_address(ptr, magic) || magic != expected) {
+       if (get_kernel_nofault(magic, ptr) || magic != expected) {
                pr_err("invalid magic at %#lx + %#x = %#x, expected %#x\n",
                       addr, offset, magic, expected);
                return true;
@@ -505,7 +505,7 @@ static int __init test_lockup_init(void)
        }
 
        if (lock_mmap_sem && !main_task->mm) {
-               pr_err("no mm to lock mmap_sem\n");
+               pr_err("no mm to lock mmap_lock\n");
                return -EINVAL;
        }