 @@ -1,14 +1,14 @@
-/*	$NetBSD: fault.c,v 1.114 2021/01/29 06:22:05 skrll Exp $	*/
+/*	$NetBSD: fault.c,v 1.115 2021/01/29 07:58:57 skrll Exp $	*/
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -69,29 +69,30 @@
  * SUCH DAMAGE.
+ *
  * RiscBSD kernel project
+ *
  * fault.c
+ *
  * Fault handlers
+ *
  * Created      : 28/11/94
  */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.114 2021/01/29 06:22:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.115 2021/01/29 07:58:57 skrll Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_stat.h>
 #ifdef UVMHIST
 @@ -104,27 +105,27 @@ __KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.
 #if defined(DDB) || defined(KGDB)
 #include <machine/db_machdep.h>
 #ifdef KGDB
 #include <sys/kgdb.h>
 #endif
 #if !defined(DDB)
 #define kdb_trap	kgdb_trap
 #endif
 #endif
 #include <arch/arm/arm/disassem.h>
 #include <arm/arm32/machdep.h>
-#ifdef DEBUG
+#if defined(DEBUG) && !defined(MULTIPROCESSOR)
 int last_fault_code;	/* For the benefit of pmap_fault_fixup() */
 #endif
 #if defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI)
 /* These CPUs may need data/prefetch abort fixups */
 #define	CPU_ABORT_FIXUP_REQUIRED
 #endif
 struct data_abort {
 	int (*func)(trapframe_t *, u_int, u_int, struct lwp *, ksiginfo_t *);
 	const char *desc;
 };
 @@ -441,27 +442,27 @@ data_abort_handler(trapframe_t *tf)
 			    ((insn & 0x0f9000f0) == 0x01800090))   /* STREX[BDH] */
 				ftype = VM_PROT_WRITE;
 			else if ((insn & 0x0fb00ff0) == 0x01000090)/* SWP */
 				ftype = VM_PROT_READ | VM_PROT_WRITE;
 			else
 				ftype = VM_PROT_READ;
+		}
+	}
 	/*
 	 * See if the fault is as a result of ref/mod emulation,
 	 * or domain mismatch.
 	 */
-#ifdef DEBUG
+#if defined(DEBUG) && !defined(MULTIPROCESSOR)
 	last_fault_code = fsr;
 #endif
 	if (pmap_fault_fixup(map->pmap, va, ftype, user)) {
 		UVMHIST_LOG(maphist, " <- ref/mod emul", 0, 0, 0, 0);
 		goto out;
+	}
 	if (__predict_false(curcpu()->ci_intr_depth > 0)) {
 		if (pcb->pcb_onfault) {
 			tf->tf_r0 = EINVAL;
 			tf->tf_pc = (register_t)(intptr_t) pcb->pcb_onfault;
 			return;
+		}
 @@ -876,27 +877,27 @@ prefetch_abort_handler(trapframe_t *tf)
 		ksi.ksi_signo = SIGSEGV;
 		ksi.ksi_code = SEGV_ACCERR;
 		ksi.ksi_addr = (uint32_t *)(intptr_t) fault_pc;
 		ksi.ksi_trap = fault_pc;
 		goto do_trapsignal;
+	}
 	map = &l->l_proc->p_vmspace->vm_map;
 	va = trunc_page(fault_pc);
 	/*
 	 * See if the pmap can handle this fault on its own...
 	 */
-#ifdef DEBUG
+#if defined(DEBUG) && !defined(MULTIPROCESSOR)
 	last_fault_code = -1;
 #endif
 	if (pmap_fault_fixup(map->pmap, va, VM_PROT_READ|VM_PROT_EXECUTE, 1)) {
 		UVMHIST_LOG (maphist, " <- emulated", 0, 0, 0, 0);
 		goto out;
+	}
 #ifdef DIAGNOSTIC
 	if (__predict_false(curcpu()->ci_intr_depth > 0)) {
 		printf("\nNon-emulated prefetch abort with intr_depth > 0\n");
 		dab_fatal(tf, 0, tf->tf_pc, NULL, NULL);
+	}
 #endif