From 94e5dec325733132e1590df46269456b035c716d Mon Sep 17 00:00:00 2001 From: Patrick Mooney Date: Fri, 3 Apr 2015 20:22:20 +0000 Subject: OS-4119 lxbrand panic when running native perl inside lx zone Reviewed by: Jerry Jelinek --- usr/src/uts/common/exec/java/java.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'usr/src/uts/common/exec/java/java.c') diff --git a/usr/src/uts/common/exec/java/java.c b/usr/src/uts/common/exec/java/java.c index 7cf9126e8d..4ce223a682 100644 --- a/usr/src/uts/common/exec/java/java.c +++ b/usr/src/uts/common/exec/java/java.c @@ -21,6 +21,7 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2015, Joyent, Inc. */ /* @@ -85,7 +86,7 @@ char *jexec_arg = "-jar"; static int javaexec(vnode_t *vp, struct execa *uap, struct uarg *args, struct intpdata *idatap, int level, long *execsz, int setid, - caddr_t execfile, cred_t *cred, int brand_action) + caddr_t execfile, cred_t *cred, int *brand_action) { struct intpdata idata; int error; -- cgit v1.2.3