Tue Jan 22 22:10:22 2013 UTC ()
use the definitions from lock.h


(christos)
diff -r1.1 -r1.2 src/sys/rump/librump/rumpkern/arch/i386/spinlock.c
cvs diff -r1.1 -r1.2 src/sys/rump/librump/rumpkern/arch/i386/Attic/spinlock.c (expand / switch to unified diff)

--- src/sys/rump/librump/rumpkern/arch/i386/Attic/spinlock.c 2010/05/31 22:31:07 1.1
+++ src/sys/rump/librump/rumpkern/arch/i386/Attic/spinlock.c 2013/01/22 22:10:22 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: spinlock.c,v 1.1 2010/05/31 22:31:07 pooka Exp $ */ 1/* $NetBSD: spinlock.c,v 1.2 2013/01/22 22:10:22 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2000, 2006 The NetBSD Foundation, Inc. 4 * Copyright (c) 2000, 2006 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 Jason R. Thorpe and Andrew Doran. 8 * by Jason R. Thorpe and Andrew Doran.
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.
@@ -20,59 +20,20 @@ @@ -20,59 +20,20 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
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#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: spinlock.c,v 1.1 2010/05/31 22:31:07 pooka Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: spinlock.c,v 1.2 2013/01/22 22:10:22 christos Exp $");
34 34
35#define _HARDKERNEL /* XXX: non-inline prototypes */ 35#define _HARDKERNEL /* XXX: non-inline prototypes */
 36#define SPINLOCK_BODY
36#include <x86/lock.h> 37#include <x86/lock.h>
37#undef _HARDKERNEL 38#undef _HARDKERNEL
38 39#undef SPINLOCK_BODY
39/* 
40 * Spinlocks, from src/sys/arch/x86/include/lock.h 
41 */ 
42void 
43__cpu_simple_lock_init(__cpu_simple_lock_t *lockp) 
44{ 
45 
46 *lockp = __SIMPLELOCK_UNLOCKED; 
47 __insn_barrier(); 
48} 
49 
50int 
51__cpu_simple_lock_try(__cpu_simple_lock_t *lockp) 
52{ 
53 uint8_t val; 
54 
55 val = __SIMPLELOCK_LOCKED; 
56 __asm volatile ("xchgb %0,(%2)" :  
57 "=r" (val) 
58 :"0" (val), "r" (lockp)); 
59 __insn_barrier(); 
60 return val == __SIMPLELOCK_UNLOCKED; 
61} 
62 
63void 
64__cpu_simple_lock(__cpu_simple_lock_t *lockp) 
65{ 
66 
67 while (!__cpu_simple_lock_try(lockp)) 
68 /* nothing */; 
69 __insn_barrier(); 
70} 
71 
72void 
73__cpu_simple_unlock(__cpu_simple_lock_t *lockp) 
74{ 
75 
76 __insn_barrier(); 
77 *lockp = __SIMPLELOCK_UNLOCKED; 
78}