Wed Jul 24 02:50:36 2013 UTC ()
Tag the spinlock struct in <linux/spinlock.h>.


(riastradh)
diff -r1.1.2.5 -r1.1.2.6 src/sys/external/bsd/drm2/include/linux/spinlock.h

cvs diff -r1.1.2.5 -r1.1.2.6 src/sys/external/bsd/drm2/include/linux/spinlock.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/spinlock.h 2013/07/24 02:24:58 1.1.2.5
+++ src/sys/external/bsd/drm2/include/linux/spinlock.h 2013/07/24 02:50:36 1.1.2.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: spinlock.h,v 1.1.2.5 2013/07/24 02:24:58 riastradh Exp $ */ 1/* $NetBSD: spinlock.h,v 1.1.2.6 2013/07/24 02:50:36 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -25,27 +25,27 @@ @@ -25,27 +25,27 @@
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _LINUX_SPINLOCK_H_ 32#ifndef _LINUX_SPINLOCK_H_
33#define _LINUX_SPINLOCK_H_ 33#define _LINUX_SPINLOCK_H_
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36#include <sys/mutex.h> 36#include <sys/mutex.h>
37 37
38typedef struct { 38typedef struct spinlock {
39 kmutex_t sl_lock; 39 kmutex_t sl_lock;
40} spinlock_t; 40} spinlock_t;
41 41
42static inline int 42static inline int
43spin_is_locked(spinlock_t *spinlock) 43spin_is_locked(spinlock_t *spinlock)
44{ 44{
45 return mutex_owned(&spinlock->sl_lock); 45 return mutex_owned(&spinlock->sl_lock);
46} 46}
47 47
48static inline void 48static inline void
49spin_lock(spinlock_t *spinlock) 49spin_lock(spinlock_t *spinlock)
50{ 50{
51 mutex_enter(&spinlock->sl_lock); 51 mutex_enter(&spinlock->sl_lock);