Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it build in userspace again.

Browse Source
This commit is contained in:
ad 2007-09-26 20:59:59 +00:00
parent 66ed18bcf1
commit 8c77c157eb
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/arch/x86/include/lock.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lock.h,v 1.16 2007/09/11 21:01:40 skrll Exp $ */ /* $NetBSD: lock.h,v 1.17 2007/09/26 20:59:59 ad Exp $ */
/*- /*-
* Copyright (c) 2000, 2006 The NetBSD Foundation, Inc. * Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@ -47,7 +47,9 @@
#include "opt_lockdebug.h" #include "opt_lockdebug.h"
#endif #endif
#ifdef _KERNEL
#include <machine/cpufunc.h> #include <machine/cpufunc.h>
#endif
static __inline int static __inline int
__SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr) __SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
@ -110,7 +112,9 @@ __cpu_simple_lock(__cpu_simple_lock_t *lockp)
while (x86_atomic_testset_b(lockp, __SIMPLELOCK_LOCKED) while (x86_atomic_testset_b(lockp, __SIMPLELOCK_LOCKED)
!= __SIMPLELOCK_UNLOCKED) { != __SIMPLELOCK_UNLOCKED) {
do { do {
#ifdef _KERNEL
x86_pause(); x86_pause();
#endif /* _KERNEL */
} while (*lockp == __SIMPLELOCK_LOCKED); } while (*lockp == __SIMPLELOCK_LOCKED);
} }
__insn_barrier(); __insn_barrier();
@ -196,24 +200,6 @@ __cpu_simple_unlock(__cpu_simple_lock_t *lockp)
void mb_read(void); void mb_read(void);
void mb_write(void); void mb_write(void);
void mb_memory(void); void mb_memory(void);
#else /* _KERNEL */
static __inline void
mb_read(void)
{
x86_lfence();
}
static __inline void
mb_write(void)
{
__insn_barrier();
}
static __inline void
mb_memory(void)
{
x86_mfence();
}
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* _X86_LOCK_H_ */ #endif /* _X86_LOCK_H_ */