Author: kib
Date: Fri Sep 20 07:24:18 2019
New Revision: 352549
URL: https://svnweb.freebsd.org/changeset/base/352549

Log:
  MFC r352303:
  riscv trap_pfault: remove unneeded hold of the process around vm_fault() call.

Modified:
  stable/12/sys/riscv/riscv/trap.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/riscv/riscv/trap.c
==============================================================================
--- stable/12/sys/riscv/riscv/trap.c    Fri Sep 20 05:22:34 2019        
(r352548)
+++ stable/12/sys/riscv/riscv/trap.c    Fri Sep 20 07:24:18 2019        
(r352549)
@@ -219,29 +219,7 @@ data_abort(struct trapframe *frame, int usermode)
        if (pmap_fault_fixup(map->pmap, va, ftype))
                goto done;
 
-       if (map != kernel_map) {
-               /*
-                * Keep swapout from messing with us during this
-                *      critical time.
-                */
-               PROC_LOCK(p);
-               ++p->p_lock;
-               PROC_UNLOCK(p);
-
-               /* Fault in the user page: */
-               error = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
-
-               PROC_LOCK(p);
-               --p->p_lock;
-               PROC_UNLOCK(p);
-       } else {
-               /*
-                * Don't have to worry about process locking or stacks in the
-                * kernel.
-                */
-               error = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
-       }
-
+       error = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
        if (error != KERN_SUCCESS) {
                if (usermode) {
                        sig = SIGSEGV;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to