aboutsummaryrefslogtreecommitdiff
path: root/sys/kern/imgact_aout.c
diff options
context:
space:
mode:
authorRodney W. Grimes <rgrimes@FreeBSD.org>1994-05-25 09:21:21 +0000
committerRodney W. Grimes <rgrimes@FreeBSD.org>1994-05-25 09:21:21 +0000
commit26f9a76710a312a951848542b9ca1f44100450e2 (patch)
tree9179427ac860211c445df663fd2b86267366bfba /sys/kern/imgact_aout.c
parentdbda0ec78e324aced444959e2c98b89b79f22812 (diff)
downloadsrc-26f9a76710a312a951848542b9ca1f44100450e2.tar.gz
src-26f9a76710a312a951848542b9ca1f44100450e2.zip
The big 4.4BSD Lite to FreeBSD 2.0.0 (Development) patch.
Reviewed by: Rodney W. Grimes Submitted by: John Dyson and David Greenman
Notes
Notes: svn path=/head/; revision=1549
Diffstat (limited to 'sys/kern/imgact_aout.c')
-rw-r--r--sys/kern/imgact_aout.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 5d69e097007f..4be4e5041f4a 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -31,15 +31,15 @@
* $Id: imgact_aout.c,v 1.3 1993/12/30 01:39:29 davidg Exp $
*/
-#include "param.h"
-#include "systm.h"
-#include "resourcevar.h"
-#include "exec.h"
-#include "mman.h"
-#include "imgact.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/resourcevar.h>
+#include <sys/exec.h>
+#include <sys/mman.h>
+#include <sys/imgact.h>
+#include <sys/kernel.h>
-#include "vm/vm.h"
+#include <vm/vm.h>
int
exec_aout_imgact(iparams)
@@ -135,8 +135,8 @@ exec_aout_imgact(iparams)
a_out->a_text, /* size */
VM_PROT_READ | VM_PROT_EXECUTE, /* protection */
VM_PROT_READ | VM_PROT_EXECUTE | VM_PROT_WRITE, /* max protection */
- MAP_FILE | MAP_PRIVATE | MAP_FIXED, /* flags */
- iparams->vnodep, /* vnode */
+ MAP_PRIVATE | MAP_FIXED, /* flags */
+ (caddr_t)iparams->vnodep, /* vnode */
file_offset); /* offset */
if (error)
return (error);
@@ -151,7 +151,8 @@ exec_aout_imgact(iparams)
&vmaddr,
a_out->a_data,
VM_PROT_READ | VM_PROT_WRITE | (a_out->a_text ? 0 : VM_PROT_EXECUTE),
- VM_PROT_ALL, MAP_FILE | MAP_PRIVATE | MAP_FIXED, iparams->vnodep,
+ VM_PROT_ALL, MAP_PRIVATE | MAP_FIXED,
+ (caddr_t) iparams->vnodep,
file_offset + a_out->a_text);
if (error)
return (error);