summaryrefslogtreecommitdiffstats
path: root/sys/compat
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2007-01-14 16:07:01 +0000
committernetchild <netchild@FreeBSD.org>2007-01-14 16:07:01 +0000
commit48557a3c88d9826b668405c0e43691dc9d33fd21 (patch)
tree9097cf72ba020339417787ce293b32d53e0467ee /sys/compat
parentbbcd6fc1d476bb1c1034eb77541305988fad07cb (diff)
downloadFreeBSD-src-48557a3c88d9826b668405c0e43691dc9d33fd21.zip
FreeBSD-src-48557a3c88d9826b668405c0e43691dc9d33fd21.tar.gz
MFp4 (112705):
Inherit setting of the default emulation version to the jails. Pointed out by: jhb Submitted by: rdivacky
Diffstat (limited to 'sys/compat')
-rw-r--r--sys/compat/linux/linux_mib.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index ac5774e..095b5ee 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -233,7 +233,7 @@ linux_use26(struct thread *td)
{
struct prison *pr;
struct linux_prison *lpr;
- int use26 = 0; /* defaults to off */
+ int use26 = linux_use_linux26;
pr = td->td_ucred->cr_prison;
if (pr != NULL) {
@@ -241,8 +241,7 @@ linux_use26(struct thread *td)
lpr = (struct linux_prison *)pr->pr_linux;
use26 = lpr->pr_use_linux26;
}
- } else
- use26 = linux_use_linux26;
+ }
return (use26);
}
OpenPOWER on IntegriCloud