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,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -41,38 +41,40 @@
  * MP-safe compare-and-swap.
+ *
  * So, what we have done is implement simple mutexes using a compare-and-swap.
  * We support pre-ARMv6 by implementing CAS as a restartable atomic sequence
  * that is checked by the IRQ vector.
+ *
  */
 struct kmutex {
 	union {
 		/* Adaptive mutex */
 		volatile uintptr_t	mtxa_owner;	/* 0-3 */
 #ifdef _KERNEL
 		/* Spin mutex */
 		struct {
 			/*
 			 * Since the low bit of mtxa_owner is used to flag this
 			 * mutex as a spin mutex, we can't use the first byte
 			 * or the last byte to store the ipl or lock values.
 			 */
 			volatile uint8_t	mtxs_dummy;
 			ipl_cookie_t		mtxs_ipl;
 			__cpu_simple_lock_t	mtxs_lock;
 			volatile uint8_t	mtxs_unused;
 		} s;
 #endif
 	} u;
 };
 #ifdef __MUTEX_PRIVATE
 #define	mtx_owner		u.mtxa_owner
 #define	mtx_ipl			u.s.mtxs_ipl
 #define	mtx_lock		u.s.mtxs_lock
 #if 0
 #define	__HAVE_MUTEX_STUBS		1
 #define	__HAVE_SPIN_MUTEX_STUBS		1
 #endif

--- 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,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,32 +25,34 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _X86_MUTEX_H_
 #define	_X86_MUTEX_H_
 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;
 };
 #ifdef __MUTEX_PRIVATE
 #define	mtx_owner 			u.mtxa_owner
 #define	mtx_ipl 			u.s.mtxs_ipl
 #define	mtx_lock			u.s.mtxs_lock
 #define __HAVE_MUTEX_STUBS		1
 #define __HAVE_SPIN_MUTEX_STUBS		1
 #define	__HAVE_SIMPLE_MUTEXES		1