Thu Mar 5 17:58:08 2020 UTC ()

Fix userland build by surrounding stuff with #ifdef _KERNEL.

(...Why does this header file get exposed to userland at all?)


(riastradh)

diff -r1.22 -r1.23 src/sys/arch/arm/include/mutex.h
diff -r1.8 -r1.9 src/sys/arch/x86/include/mutex.h

--- src/sys/arch/arm/include/mutex.h 2020/03/05 15:56:55	1.22

+++ src/sys/arch/arm/include/mutex.h 2020/03/05 17:58:08	1.23

@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.22 2020/03/05 15:56:55 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.23 2020/03/05 17:58:08 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -51,6 +51,7 @@
 		/* Adaptive mutex */
 		volatile uintptr_t	mtxa_owner;	/* 0-3 */
 
+#ifdef _KERNEL
 		/* Spin mutex */
 		struct {
 			/*
@@ -63,6 +64,7 @@
 			__cpu_simple_lock_t	mtxs_lock;
 			volatile uint8_t	mtxs_unused;
 		} s;
+#endif
 	} u;
 };

--- src/sys/arch/x86/include/mutex.h 2020/03/05 15:56:55	1.8

+++ src/sys/arch/x86/include/mutex.h 2020/03/05 17:58:08	1.9

@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.8 2020/03/05 15:56:55 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.9 2020/03/05 17:58:08 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2009 The NetBSD Foundation, Inc.
@@ -35,12 +35,14 @@
 struct kmutex {
 	union {
 		volatile uintptr_t	mtxa_owner;
+#ifdef _KERNEL
 		struct {
 			volatile uint8_t	mtxs_dummy;
 			ipl_cookie_t		mtxs_ipl;
                         __cpu_simple_lock_t	mtxs_lock;
 			volatile uint8_t	mtxs_unused;
 		} s;
+#endif
 	} u;
 };