[src/trunk]: src/sys/arch/mips/mips This file is only ever used when MULTIPRO...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a6c9b97a8dfe
branches:  trunk
changeset: 974715:a6c9b97a8dfe
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Aug 09 08:33:52 2020 +0000

description:
This file is only ever used when MULTIPROCESSOR so unifdef MULTIPROCESSOR

diffstat:

 sys/arch/mips/mips/lock_stubs_llsc.S |  15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diffs (51 lines):

diff -r 1333bdaaacc4 -r a6c9b97a8dfe sys/arch/mips/mips/lock_stubs_llsc.S
--- a/sys/arch/mips/mips/lock_stubs_llsc.S      Sun Aug 09 08:13:09 2020 +0000
+++ b/sys/arch/mips/mips/lock_stubs_llsc.S      Sun Aug 09 08:33:52 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lock_stubs_llsc.S,v 1.11 2020/08/06 10:00:21 skrll Exp $       */
+/*     $NetBSD: lock_stubs_llsc.S,v 1.12 2020/08/09 08:33:52 skrll Exp $       */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,20 +31,15 @@
 
 #include "opt_cputype.h"
 #include "opt_lockdebug.h"
-#include "opt_multiprocessor.h"
 
 #include <sys/errno.h>
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: lock_stubs_llsc.S,v 1.11 2020/08/06 10:00:21 skrll Exp $")
+RCSID("$NetBSD: lock_stubs_llsc.S,v 1.12 2020/08/09 08:33:52 skrll Exp $")
 
 #include "assym.h"
 
-#if defined(DIAGNOSTIC) || defined(MULTIPROCESSOR)
-#define        FULL
-#endif
-
 /*
  * Set ISA level for the assembler.
  * XXX Clean up with a macro?  Same code fragment is in mipsX_subr.S too.
@@ -259,7 +254,7 @@
 12:    bnez    v0, 12b                 # loop forever if any are true
         nop
 #endif /* PARANOIA */
-#if defined(FULL)
+
        LLSCSYNC
        INT_LL  t3, MTX_LOCK(t0)
 3:
@@ -273,10 +268,6 @@
 4:
        j       _C_LABEL(mutex_spin_retry)
         move   a0, t0
-#else
-       j       ra
-        nop
-#endif /* FULL */
 END(llsc_mutex_spin_enter)
 
 /*