Module Name: src
Committed By: skrll
Date: Sun Aug 9 08:33:52 UTC 2020
Modified Files:
src/sys/arch/mips/mips: lock_stubs_llsc.S
Log Message:
This file is only ever used when MULTIPROCESSOR so unifdef MULTIPROCESSOR
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/mips/lock_stubs_llsc.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/lock_stubs_llsc.S
diff -u src/sys/arch/mips/mips/lock_stubs_llsc.S:1.11 src/sys/arch/mips/mips/lock_stubs_llsc.S:1.12
--- src/sys/arch/mips/mips/lock_stubs_llsc.S:1.11 Thu Aug 6 10:00:21 2020
+++ src/sys/arch/mips/mips/lock_stubs_llsc.S Sun Aug 9 08:33:52 2020
@@ -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 @@ STATIC_NESTED(llsc_mutex_spin_enter, CAL
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 @@ STATIC_NESTED(llsc_mutex_spin_enter, CAL
4:
j _C_LABEL(mutex_spin_retry)
move a0, t0
-#else
- j ra
- nop
-#endif /* FULL */
END(llsc_mutex_spin_enter)
/*
