summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-04-06 22:47:55 +0000
committerriastradh <riastradh@NetBSD.org>2022-04-06 22:47:55 +0000
commit8b341aeb33fb1f525ea7d7a58c1bb06dcb74439a (patch)
treef2c9159a9ac441e0b64e9f5530574cc6de9ba88b /sys/arch
parent7991e265fb833c6138ec0e83b3ec47763077385f (diff)
Nix trailing whitespace in files of membars, atomics, and lock stubs.
Will be touching many of these files soon for functional changes. No functional change intended.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/i386/lock_stubs.S10
-rw-r--r--sys/arch/ia64/include/mutex.h5
-rw-r--r--sys/arch/m68k/m68k/lock_stubs.s4
-rw-r--r--sys/arch/powerpc/powerpc/lock_stubs.S4
-rw-r--r--sys/arch/sparc/sparc/lock_stubs.s4
-rw-r--r--sys/arch/sparc64/sparc64/lock_stubs.s4
-rw-r--r--sys/arch/vax/include/mutex.h4
-rw-r--r--sys/arch/vax/vax/lock_stubs.S6
8 files changed, 20 insertions, 21 deletions
diff --git a/sys/arch/i386/i386/lock_stubs.S b/sys/arch/i386/i386/lock_stubs.S
index 7c946a2352d..3d0940b7b91 100644
--- a/sys/arch/i386/i386/lock_stubs.S
+++ b/sys/arch/i386/i386/lock_stubs.S
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.35 2020/05/01 09:40:47 maxv Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.36 2022/04/06 22:47:57 riastradh Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -15,7 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -31,11 +31,11 @@
/*
* Where possible we make each routine fit into an assumed 64-byte cache
- * line. Please check alignment with 'objdump -d' after making changes.
+ * line. Please check alignment with 'objdump -d' after making changes.
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.35 2020/05/01 09:40:47 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.36 2022/04/06 22:47:57 riastradh Exp $");
#include "opt_lockdebug.h"
@@ -354,7 +354,7 @@ ENTRY(__cpu_simple_lock_try)
LOCK(7)
cmpxchgb %ah, (%edx)
movl $0, %eax
- setz %al
+ setz %al
RET(8)
END(__cpu_simple_lock_try)
diff --git a/sys/arch/ia64/include/mutex.h b/sys/arch/ia64/include/mutex.h
index f1d35bafa5f..848993fa7d9 100644
--- a/sys/arch/ia64/include/mutex.h
+++ b/sys/arch/ia64/include/mutex.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.6 2021/08/25 04:13:41 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.7 2022/04/06 22:47:57 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,7 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -47,7 +47,6 @@ struct kmutex {
__cpu_simple_lock_t mtx_lock;
};
-
/* XXX when we implement mutex_enter()/mutex_exit(), uncomment this
#define __HAVE_MUTEX_STUBS 1
*/
diff --git a/sys/arch/m68k/m68k/lock_stubs.s b/sys/arch/m68k/m68k/lock_stubs.s
index a09dce37610..96ea413a992 100644
--- a/sys/arch/m68k/m68k/lock_stubs.s
+++ b/sys/arch/m68k/m68k/lock_stubs.s
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.s,v 1.10 2020/03/08 06:12:01 rin Exp $ */
+/* $NetBSD: lock_stubs.s,v 1.11 2022/04/06 22:47:57 riastradh Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -15,7 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/sys/arch/powerpc/powerpc/lock_stubs.S b/sys/arch/powerpc/powerpc/lock_stubs.S
index 00dc0823a8e..346e0bb1cbf 100644
--- a/sys/arch/powerpc/powerpc/lock_stubs.S
+++ b/sys/arch/powerpc/powerpc/lock_stubs.S
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.13 2020/07/06 09:34:18 rin Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.14 2022/04/06 22:47:57 riastradh Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -15,7 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/sys/arch/sparc/sparc/lock_stubs.s b/sys/arch/sparc/sparc/lock_stubs.s
index 86dcb5af0a5..71ce82400f5 100644
--- a/sys/arch/sparc/sparc/lock_stubs.s
+++ b/sys/arch/sparc/sparc/lock_stubs.s
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.s,v 1.13 2019/12/30 22:13:47 ad Exp $ */
+/* $NetBSD: lock_stubs.s,v 1.14 2022/04/06 22:47:57 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -15,7 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/sys/arch/sparc64/sparc64/lock_stubs.s b/sys/arch/sparc64/sparc64/lock_stubs.s
index 1598d45f03c..c4f2be6271a 100644
--- a/sys/arch/sparc64/sparc64/lock_stubs.s
+++ b/sys/arch/sparc64/sparc64/lock_stubs.s
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.s,v 1.10 2021/08/25 13:28:51 thorpej Exp $ */
+/* $NetBSD: lock_stubs.s,v 1.11 2022/04/06 22:47:57 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
@@ -15,7 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/sys/arch/vax/include/mutex.h b/sys/arch/vax/include/mutex.h
index 112116727f5..208738c5b99 100644
--- a/sys/arch/vax/include/mutex.h
+++ b/sys/arch/vax/include/mutex.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.16 2021/08/25 04:13:42 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.17 2022/04/06 22:47:57 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
/*
* The VAX mutex implementation is troublesome, because VAX lacks a
- * compare-and-swap operation.
+ * compare-and-swap operation.
*
* So we emulate compare-and-swap by raising IPL to lock out interrupts
* and (if MP) using BBSSI/BBCCI to lock out the other processors.
diff --git a/sys/arch/vax/vax/lock_stubs.S b/sys/arch/vax/vax/lock_stubs.S
index e6352764e31..ffa9658f15e 100644
--- a/sys/arch/vax/vax/lock_stubs.S
+++ b/sys/arch/vax/vax/lock_stubs.S
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.18 2013/12/09 09:35:16 wiz Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.19 2022/04/06 22:47:58 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@ ENTRY(mutex_spin_enter, 0)
mfpr $PR_IPL, %r2 /* get current IPL */
movzbl MTX_IPL(%r0), %r3
cmpl %r3, %r2 /* does mutex have > IPL? */
- bleq 1f /* no, leave IPL alone */
+ bleq 1f /* no, leave IPL alone */
mtpr %r3, $PR_IPL /* yes, raise IPL */
1: mfpr $PR_SSP, %r4 /* get curlwp */
movl L_CPU(%r4),%r4 /* get cpu_info */
@@ -137,7 +137,7 @@ ENTRY(mutex_spin_exit, 0)
incl CI_MTX_COUNT(%r4) /* incr mtx count */
bneq 1f /* still held? */
mtpr %r2, $PR_IPL /* no, restore saved ipl */
-1: ret
+1: ret
#if defined(DIAGNOSTIC) || defined(MULTIPROCESSOR)
2: callg (%ap), _C_LABEL(mutex_vector_exit) /* slow path */