Merge tag 'riscv-for-linus-5.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel...
[platform/kernel/linux-rpi.git] / mm / mprotect.c
index ab70902..e7a4431 100644 (file)
@@ -617,10 +617,11 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
                if (tmp > end)
                        tmp = end;
 
-               if (vma->vm_ops && vma->vm_ops->mprotect)
+               if (vma->vm_ops && vma->vm_ops->mprotect) {
                        error = vma->vm_ops->mprotect(vma, nstart, tmp, newflags);
-               if (error)
-                       goto out;
+                       if (error)
+                               goto out;
+               }
 
                error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
                if (error)
@@ -698,7 +699,7 @@ SYSCALL_DEFINE1(pkey_free, int, pkey)
        mmap_write_unlock(current->mm);
 
        /*
-        * We could provie warnings or errors if any VMA still
+        * We could provide warnings or errors if any VMA still
         * has the pkey set here.
         */
        return ret;