[src/trunk]: src/sys/rump/librump/rumpkern/arch/i386 use the definitions from...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3ed77ea7804d
branches:  trunk
changeset: 784241:3ed77ea7804d
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 22 22:10:22 2013 +0000

description:
use the definitions from lock.h

diffstat:

 sys/rump/librump/rumpkern/arch/i386/spinlock.c |  47 ++-----------------------
 1 files changed, 4 insertions(+), 43 deletions(-)

diffs (62 lines):

diff -r 0441085f3e54 -r 3ed77ea7804d sys/rump/librump/rumpkern/arch/i386/spinlock.c
--- a/sys/rump/librump/rumpkern/arch/i386/spinlock.c    Tue Jan 22 22:09:44 2013 +0000
+++ b/sys/rump/librump/rumpkern/arch/i386/spinlock.c    Tue Jan 22 22:10:22 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spinlock.c,v 1.1 2010/05/31 22:31:07 pooka Exp $       */
+/*     $NetBSD: spinlock.c,v 1.2 2013/01/22 22:10:22 christos Exp $    */
 
 /*-
  * Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@@ -30,49 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spinlock.c,v 1.1 2010/05/31 22:31:07 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spinlock.c,v 1.2 2013/01/22 22:10:22 christos Exp $");
 
 #define _HARDKERNEL /* XXX: non-inline prototypes */
+#define SPINLOCK_BODY
 #include <x86/lock.h>
 #undef _HARDKERNEL
-
-/*
- * Spinlocks, from src/sys/arch/x86/include/lock.h
- */
-void
-__cpu_simple_lock_init(__cpu_simple_lock_t *lockp)
-{
-
-       *lockp = __SIMPLELOCK_UNLOCKED;
-       __insn_barrier();
-}
-
-int
-__cpu_simple_lock_try(__cpu_simple_lock_t *lockp)
-{
-       uint8_t val;
-
-       val = __SIMPLELOCK_LOCKED;
-       __asm volatile ("xchgb %0,(%2)" : 
-           "=r" (val)
-           :"0" (val), "r" (lockp));
-       __insn_barrier();
-       return val == __SIMPLELOCK_UNLOCKED;
-}
-
-void
-__cpu_simple_lock(__cpu_simple_lock_t *lockp)
-{
-
-       while (!__cpu_simple_lock_try(lockp))
-               /* nothing */;
-       __insn_barrier();
-}
-
-void
-__cpu_simple_unlock(__cpu_simple_lock_t *lockp)
-{
-
-       __insn_barrier();
-       *lockp = __SIMPLELOCK_UNLOCKED;
-}
+#undef SPINLOCK_BODY