summaryrefslogtreecommitdiffstats
path: root/sys/compat/linux/linux_misc.c
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2007-01-07 19:00:38 +0000
committernetchild <netchild@FreeBSD.org>2007-01-07 19:00:38 +0000
commit977ef4a8bc07aa2c92b23e4bb7186faa23962c01 (patch)
tree2e7e3c97c0aff026ed87ffff86d825e74404ebfe /sys/compat/linux/linux_misc.c
parentdbeee4cdb70c4f3e6ed86a2e3c135873e756084c (diff)
downloadFreeBSD-src-977ef4a8bc07aa2c92b23e4bb7186faa23962c01.zip
FreeBSD-src-977ef4a8bc07aa2c92b23e4bb7186faa23962c01.tar.gz
MFp4 (112498):
Rename the locking flags to EMUL_DOLOCK and EMUL_DONTLOCK to prevent confusion. Submitted by: rdivacky
Diffstat (limited to 'sys/compat/linux/linux_misc.c')
-rw-r--r--sys/compat/linux/linux_misc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index e137e6b..ff08e67 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1439,7 +1439,7 @@ linux_getpid(struct thread *td, struct linux_getpid_args *args)
#endif
if (linux_use26(td)) {
- em = em_find(td->td_proc, EMUL_UNLOCKED);
+ em = em_find(td->td_proc, EMUL_DOLOCK);
KASSERT(em != NULL, ("getpid: emuldata not found.\n"));
td->td_retval[0] = em->shared->group_pid;
EMUL_UNLOCK(&emul_lock);
@@ -1481,7 +1481,7 @@ linux_getppid(struct thread *td, struct linux_getppid_args *args)
return (0);
}
- em = em_find(td->td_proc, EMUL_UNLOCKED);
+ em = em_find(td->td_proc, EMUL_DOLOCK);
KASSERT(em != NULL, ("getppid: process emuldata not found.\n"));
@@ -1501,7 +1501,7 @@ linux_getppid(struct thread *td, struct linux_getppid_args *args)
/* if its also linux process */
if (pp->p_sysent == &elf_linux_sysvec) {
- em = em_find(pp, EMUL_LOCKED);
+ em = em_find(pp, EMUL_DONTLOCK);
KASSERT(em != NULL, ("getppid: parent emuldata not found.\n"));
td->td_retval[0] = em->shared->group_pid;
@@ -1608,7 +1608,7 @@ linux_exit_group(struct thread *td, struct linux_exit_group_args *args)
#endif
if (linux_use26(td)) {
- td_em = em_find(td->td_proc, EMUL_UNLOCKED);
+ td_em = em_find(td->td_proc, EMUL_DOLOCK);
KASSERT(td_em != NULL, ("exit_group: emuldata not found.\n"));
@@ -1656,13 +1656,13 @@ linux_prctl(struct thread *td, struct linux_prctl_args *args)
case LINUX_PR_SET_PDEATHSIG:
if (!LINUX_SIG_VALID(args->arg2))
return (EINVAL);
- em = em_find(p, EMUL_UNLOCKED);
+ em = em_find(p, EMUL_DOLOCK);
KASSERT(em != NULL, ("prctl: emuldata not found.\n"));
em->pdeath_signal = args->arg2;
EMUL_UNLOCK(&emul_lock);
break;
case LINUX_PR_GET_PDEATHSIG:
- em = em_find(p, EMUL_UNLOCKED);
+ em = em_find(p, EMUL_DOLOCK);
KASSERT(em != NULL, ("prctl: emuldata not found.\n"));
error = copyout(&em->pdeath_signal,
(void *)(register_t)args->arg2,
OpenPOWER on IntegriCloud