summaryrefslogtreecommitdiffstats
path: root/sys/compat
diff options
context:
space:
mode:
authorjulian <julian@FreeBSD.org>1998-12-24 21:21:20 +0000
committerjulian <julian@FreeBSD.org>1998-12-24 21:21:20 +0000
commit46bb1eee7922211ea3e4eb585e73987cda707a3d (patch)
treeec52ac0cb508cac64a828c4d8efd6c9979c0c2cc /sys/compat
parent7378825b0e71060e7b343d81b981dcb9402fa0f3 (diff)
downloadFreeBSD-src-46bb1eee7922211ea3e4eb585e73987cda707a3d.zip
FreeBSD-src-46bb1eee7922211ea3e4eb585e73987cda707a3d.tar.gz
According to the author..
"I've been having a problem running the patches [committed to current] installed with the COMPAT_LINUX_THREADS option along with the VM_STACK patches I did. I'm not sure what the problem is, since it seemed to work before. In any event, the attached patch fixes the problem for me. While I've had no report of problems from anyone else, possibly it would be wise to commit the patch until the problem is found. Also, there was some left-over junk in the linux_misc.c file from some earlier work I did. The attached patch cleans that up too." Submitted by: "Richard Seaman, Jr." <dick@tar.com>
Diffstat (limited to 'sys/compat')
-rw-r--r--sys/compat/linux/linux_misc.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 4b441fd..2f12f38 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: linux_misc.c,v 1.47 1998/12/10 13:47:18 jkh Exp $
+ * $Id: linux_misc.c,v 1.48 1998/12/19 02:55:33 julian Exp $
*/
#include <sys/param.h>
@@ -583,12 +583,7 @@ linux_clone(struct proc *p, struct linux_clone_args *args)
{
int error, ff = RFPROC;
struct proc *p2;
- int growable;
- int initstacksize;
- int maxstacksize;
int exit_signal;
- vm_map_entry_t entry;
- vm_map_t map;
vm_offset_t start;
struct rfork_args rf_args;
@@ -630,7 +625,7 @@ linux_clone(struct proc *p, struct linux_clone_args *args)
p2 = pfind(p->p_retval[0]);
if (p2 == 0)
return ESRCH;
-
+
p2->p_sigparent = exit_signal;
p2->p_md.md_regs->tf_esp = (unsigned int)args->stack;
@@ -693,14 +688,14 @@ linux_mmap(struct proc *p, struct linux_mmap_args *args)
bsd_args.len = linux_args.len;
#else
-#if !defined(USE_VM_STACK) && !defined(USE_VM_STACK_FOR_EXEC)
+ /*#if !defined(USE_VM_STACK) && !defined(USE_VM_STACK_FOR_EXEC)*/
/* Linux Threads will map into the proc stack space, unless
we prevent it. This causes problems if we're not using
our VM_STACK options.
*/
if ((unsigned int)linux_args.addr + linux_args.len > (USRSTACK - MAXSSIZ))
return (EINVAL);
-#endif
+ /*#endif*/
if (linux_args.flags & LINUX_MAP_GROWSDOWN) {
OpenPOWER on IntegriCloud