From owner-p4-projects@FreeBSD.ORG Tue Aug 14 21:35:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE93016A421; Tue, 14 Aug 2007 21:35:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7ED316A419 for ; Tue, 14 Aug 2007 21:35:04 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A44C13C45E for ; Tue, 14 Aug 2007 21:35:04 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7ELZ4dx002850 for ; Tue, 14 Aug 2007 21:35:04 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7ELZ4T5002847 for perforce@freebsd.org; Tue, 14 Aug 2007 21:35:04 GMT (envelope-from jbr@FreeBSD.org) Date: Tue, 14 Aug 2007 21:35:04 GMT Message-Id: <200708142135.l7ELZ4T5002847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 125156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2007 21:35:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=125156 Change 125156 by jbr@jbr_bob on 2007/08/14 21:34:29 Moved the address of usrsyshm to proc Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/elf_machdep.c#4 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/init_main.c#4 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#12 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/proc.h#3 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/sysent.h#4 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/elf_machdep.c#4 (text+ko) ==== @@ -68,7 +68,6 @@ VM_MAXUSER_ADDRESS, USRSTACK, PS_STRINGS, - 0, VM_PROT_ALL, exec_copyout_strings, exec_setregs, ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/init_main.c#4 (text+ko) ==== @@ -341,7 +341,6 @@ VM_MAXUSER_ADDRESS, USRSTACK, PS_STRINGS, - 0, VM_PROT_ALL, NULL, NULL, ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#12 (text+ko) ==== @@ -158,12 +158,12 @@ #ifdef SCTL_MASK32 if (req->flags & SCTL_MASK32) { unsigned int val; - val = (unsigned int)p->p_sysent->sv_sysshm; + val = (unsigned int)p->p_sysshm; error = SYSCTL_OUT(req, &val, sizeof(val)); } else #endif - error = SYSCTL_OUT(req, &p->p_sysent->sv_sysshm, - sizeof(p->p_sysent->sv_sysshm)); + error = SYSCTL_OUT(req, &p->p_sysshm, + sizeof(p->p_sysshm)); return error; } @@ -915,13 +915,23 @@ { int error; vm_map_t map = &imgp->proc->p_vmspace->vm_map; - vm_offset_t *addr = &imgp->proc->p_sysent->sv_sysshm; - + vm_offset_t *addr = &imgp->proc->p_sysshm; +/* + vm_map_t tmap; + vm_object_t object; + vm_map_entry_t entry; + vm_pindex_t pindex; +*/ if (imgp->sysshm != NULL) exec_unmap_sysshm(imgp); error = vm_map_sysshm(map, addr, 42); - +/* + tmap = map; + vm_map_lookup(&tmap, *addr, VM_PROT_READ, &entry, &object, &pindex, NULL, + NULL); + vm_map_lookup_done(tmap, entry); +*/ return(error); } ==== //depot/projects/soc2007/jbr-syscall/src/sys/sys/proc.h#3 (text+ko) ==== @@ -576,6 +576,7 @@ void *p_emuldata; /* (c) Emulator state data. */ struct label *p_label; /* (*) Proc (not subject) MAC label. */ struct p_sched *p_sched; /* (*) Scheduler-specific data. */ + vm_offset_t p_sysshm; STAILQ_HEAD(, ktr_request) p_ktr; /* (o) KTR event queue. */ LIST_HEAD(, mqueue_notifier) p_mqnotifier; /* (c) mqueue notifiers.*/ }; ==== //depot/projects/soc2007/jbr-syscall/src/sys/sys/sysent.h#4 (text+ko) ==== @@ -95,8 +95,6 @@ vm_offset_t sv_maxuser; /* VM_MAXUSER_ADDRESS */ vm_offset_t sv_usrstack; /* USRSTACK */ vm_offset_t sv_psstrings; /* PS_STRINGS */ - vm_offset_t sv_sysshm; /* memory shared between proccess and - kernel */ int sv_stackprot; /* vm protection for stack */ register_t *(*sv_copyout_strings)(struct image_params *); void (*sv_setregs)(struct thread *, u_long, u_long, u_long);