Move landisk to MI mutex.

ok dlg@

1 files changed, 2 insertions, 61 deletions

diff --git a/sys/arch/sh/include/mutex.h b/sys/arch/sh/include/mutex.h
index 461a462049f..18c3edb3727 100644
--- a/sys/arch/sh/include/mutex.h
+++ b/sys/arch/sh/include/mutex.h
@@ -1,62 +1,3 @@
-/*	$OpenBSD: mutex.h,v 1.4 2017/05/18 01:27:49 visa Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.5 2018/02/11 09:30:12 mpi Exp $	*/
 
-/*
- * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
- * All rights reserved. 
- *
- * 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. 
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF 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 _SH_MUTEX_H_
-#define _SH_MUTEX_H_
-
-/*
- * Simple non-mp implementation.
- */
-struct mutex {
-	int mtx_lock;
-	int mtx_wantipl;
-	int mtx_oldipl;
-};
-
-void _mtx_init(struct mutex *, int);
-
-#define MUTEX_INITIALIZER_FLAGS(ipl, name, flags) \
-	{ 0, (ipl) << 4, 0 }
-
-#ifdef DIAGNOSTIC
-#define MUTEX_ASSERT_LOCKED(mtx) do {					\
-	if ((mtx)->mtx_lock == 0)					\
-		panic("mutex %p not held in %s", (mtx), __func__);	\
-} while (0)
-
-#define MUTEX_ASSERT_UNLOCKED(mtx) do {					\
-	if ((mtx)->mtx_lock != 0)					\
-		panic("mutex %p held in %s", (mtx), __func__);		\
-} while (0)
-#else
-#define MUTEX_ASSERT_LOCKED(mtx) do { } while (0)
-#define MUTEX_ASSERT_UNLOCKED(mtx) do { } while (0)
-#endif
-
-#define MUTEX_OLDIPL(mtx)	(mtx)->mtx_oldipl
-
-#endif	/* _SH_MUTEX_H_ */
+#define __USE_MI_MUTEX