Re: sparc64: WITNESS broken

[Klemens Nanni]

On Sun, May 17, 2020 at 07:49:02AM +0000, Visa Hankala wrote:
> This is OK.
Should I commit arm as well?  I have no device to test.
 
> Please keep the checker disabled by default.
Obviously; just wanted to show explicitly which config I used.


Index: /sys/arch/arm/arm/mem.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/mem.c,v
retrieving revision 1.21
diff -u -p -r1.21 mem.c
--- /sys/arch/arm/arm/mem.c     19 Feb 2018 08:59:52 -0000      1.21
+++ /sys/arch/arm/arm/mem.c     17 May 2020 03:06:33 -0000
@@ -141,10 +141,11 @@ mmclose(dev_t dev, int flag, int mode, s
        return (0);
 }
 
+static struct rwlock physlock = RWLOCK_INITIALIZER("mmrw");
+
 int
 mmrw(dev_t dev, struct uio *uio, int flags)
 {
-       static struct rwlock physlock = RWLOCK_INITIALIZER("mmrw");
        vaddr_t o, v;
        size_t c;
        struct iovec *iov;
Index: /sys/arch/sparc64/sparc64/mem.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/mem.c,v
retrieving revision 1.19
diff -u -p -r1.19 mem.c
--- /sys/arch/sparc64/sparc64/mem.c     14 Dec 2017 03:30:43 -0000      1.19
+++ /sys/arch/sparc64/sparc64/mem.c     17 May 2020 03:06:35 -0000
@@ -87,10 +87,11 @@ mmclose(dev_t dev, int flag, int mode, s
        return (0);
 }
 
+static struct rwlock physlock = RWLOCK_INITIALIZER("mmrw");
+
 int
 mmrw(dev_t dev, struct uio *uio, int flags)
 {
-       static struct rwlock physlock = RWLOCK_INITIALIZER("mmrw");
        vaddr_t o, v;
        size_t c;
        struct iovec *iov;