diff options
| author | jkim <jkim@FreeBSD.org> | 2007-04-02 18:38:13 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2007-04-02 18:38:13 +0000 |
| commit | b204c9cc1313127516a072889039c5c1302dd509 (patch) | |
| tree | 237a09dd23f69ff9869b6251a5fbbece7a6a407f /sys/compat | |
| parent | edd99c89d95a65bcd361d9145c833e7420b9b907 (diff) | |
| download | FreeBSD-src-b204c9cc1313127516a072889039c5c1302dd509.zip FreeBSD-src-b204c9cc1313127516a072889039c5c1302dd509.tar.gz | |
MFP4: Turn emul_lock into a mutex.
Submitted by: rdivacky
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/linux/linux_emul.c | 4 | ||||
| -rw-r--r-- | sys/compat/linux/linux_emul.h | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index a0221b9..1a0d5a3 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$"); #include <machine/../linux/linux_proto.h> #endif -struct sx emul_shared_lock; -struct sx emul_lock; +struct sx emul_shared_lock; +struct mtx emul_lock; /* this returns locked reference to the emuldata entry (if found) */ struct linux_emuldata * diff --git a/sys/compat/linux/linux_emul.h b/sys/compat/linux/linux_emul.h index d1e82eb..0b9dd88 100644 --- a/sys/compat/linux/linux_emul.h +++ b/sys/compat/linux/linux_emul.h @@ -29,7 +29,7 @@ */ #ifndef _LINUX_EMUL_H_ -#define _LINUX_EMUL_H_ +#define _LINUX_EMUL_H_ struct linux_emuldata_shared { int refs; @@ -55,26 +55,26 @@ struct linux_emuldata { LIST_ENTRY(linux_emuldata) threads; /* list of linux threads */ }; -struct linux_emuldata *em_find(struct proc *, int locked); +struct linux_emuldata *em_find(struct proc *, int locked); -#define EMUL_LOCK(l) sx_xlock(l) -#define EMUL_UNLOCK(l) sx_xunlock(l) +#define EMUL_LOCK(l) mtx_lock(l) +#define EMUL_UNLOCK(l) mtx_unlock(l) -#define EMUL_SHARED_RLOCK(l) sx_slock(l) -#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) -#define EMUL_SHARED_WLOCK(l) sx_xlock(l) -#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) +#define EMUL_SHARED_RLOCK(l) sx_slock(l) +#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) +#define EMUL_SHARED_WLOCK(l) sx_xlock(l) +#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) /* for em_find use */ -#define EMUL_DOLOCK 1 -#define EMUL_DONTLOCK 0 +#define EMUL_DOLOCK 1 +#define EMUL_DONTLOCK 0 int linux_proc_init(struct thread *, pid_t, int); void linux_proc_exit(void *, struct proc *); void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); -extern struct sx emul_shared_lock; -extern struct sx emul_lock; +extern struct sx emul_shared_lock; +extern struct mtx emul_lock; #endif /* !_LINUX_EMUL_H_ */ |
