diff options
author | peter <peter@FreeBSD.org> | 1996-03-12 06:20:19 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1996-03-12 06:20:19 +0000 |
commit | ba0b5e96d01d0cca5891605bf9dd055e9e4a44f1 (patch) | |
tree | bb15f2c5655fdc6f3dca93a0d7220ec04acb062c | |
parent | a693ae062d212e1bc01433d93196ae773e193ad5 (diff) | |
download | FreeBSD-src-ba0b5e96d01d0cca5891605bf9dd055e9e4a44f1.zip FreeBSD-src-ba0b5e96d01d0cca5891605bf9dd055e9e4a44f1.tar.gz |
Remove references to MAP_FILE.. That is now "default" and is only
a "#define MAP_FILE 0" that is still there for net-2 source compatability.
-rw-r--r-- | sys/compat/linux/linux_misc.c | 4 | ||||
-rw-r--r-- | sys/i386/ibcs2/imgact_coff.c | 12 | ||||
-rw-r--r-- | sys/i386/linux/imgact_linux.c | 4 | ||||
-rw-r--r-- | sys/i386/linux/linux_misc.c | 4 | ||||
-rw-r--r-- | sys/kern/imgact_elf.c | 8 |
5 files changed, 16 insertions, 16 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index bf242d9..c78b6b9 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.14 1996/03/04 21:03:07 peter Exp $ + * $Id: linux_misc.c,v 1.15 1996/03/10 23:25:17 peter Exp $ */ #include <sys/param.h> @@ -333,7 +333,7 @@ printf("uselib: Non page aligned binary %d\n", file_offset); /* map file into kernel_map */ error = vm_mmap(kernel_map, &buffer, round_page(a_out->a_text + a_out->a_data + file_offset), - VM_PROT_READ, VM_PROT_READ, MAP_FILE, + VM_PROT_READ, VM_PROT_READ, 0, (caddr_t)vp, trunc_page(file_offset)); if (error) goto cleanup; diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index 6df08a6..a1397cc 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -26,7 +26,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: imgact_coff.c,v 1.12 1996/01/19 23:00:38 dyson Exp $ + * $Id: imgact_coff.c,v 1.13 1996/03/12 06:13:08 peter Exp $ */ #include <sys/param.h> @@ -96,7 +96,7 @@ load_coff_section(vmspace, vp, offset, vmaddr, memsz, filsz, prot) } DPRINTF(("%s(%d): vm_mmap(&vmspace->vm_map, &0x%08lx, 0x%x, 0x%x, " - "VM_PROT_ALL, MAP_FILE | MAP_PRIVATE | MAP_FIXED, vp, 0x%x)\n", + "VM_PROT_ALL, MAP_PRIVATE | MAP_FIXED, vp, 0x%x)\n", __FILE__, __LINE__, map_addr, map_len, prot, map_offset)); if (error = vm_mmap(&vmspace->vm_map, @@ -104,7 +104,7 @@ load_coff_section(vmspace, vp, offset, vmaddr, memsz, filsz, prot) map_len, prot, VM_PROT_ALL, - MAP_FILE | MAP_PRIVATE | MAP_FIXED, + MAP_PRIVATE | MAP_FIXED, (caddr_t) vp, map_offset)) return error; @@ -140,7 +140,7 @@ load_coff_section(vmspace, vp, offset, vmaddr, memsz, filsz, prot) PAGE_SIZE, VM_PROT_READ, VM_PROT_READ, - MAP_FILE, + 0, (caddr_t) vp, trunc_page(offset + filsz))) return error; @@ -219,7 +219,7 @@ coff_load_file(struct proc *p, char *name) PAGE_SIZE, VM_PROT_READ, VM_PROT_READ, - MAP_FILE, + 0, (caddr_t) vp, 0)) goto fail; @@ -381,7 +381,7 @@ exec_coff_imgact(imgp) len, VM_PROT_READ, VM_PROT_READ, - MAP_FILE, + 0, (caddr_t) imgp->vp, foff)) { return ENOEXEC; diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 4d6d3c1..8967a6a2 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -28,7 +28,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: imgact_linux.c,v 1.10 1996/03/10 08:42:49 sos Exp $ + * $Id: imgact_linux.c,v 1.11 1996/03/10 23:25:17 peter Exp $ */ #include <sys/param.h> @@ -137,7 +137,7 @@ exec_linux_imgact(imgp) error = vm_mmap(kernel_map, &buffer, round_page(a_out->a_text + a_out->a_data + file_offset), - VM_PROT_READ, VM_PROT_READ, MAP_FILE, + VM_PROT_READ, VM_PROT_READ, 0, (caddr_t) imgp->vp, trunc_page(file_offset)); if (error) return error; diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index bf242d9..c78b6b9 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/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.14 1996/03/04 21:03:07 peter Exp $ + * $Id: linux_misc.c,v 1.15 1996/03/10 23:25:17 peter Exp $ */ #include <sys/param.h> @@ -333,7 +333,7 @@ printf("uselib: Non page aligned binary %d\n", file_offset); /* map file into kernel_map */ error = vm_mmap(kernel_map, &buffer, round_page(a_out->a_text + a_out->a_data + file_offset), - VM_PROT_READ, VM_PROT_READ, MAP_FILE, + VM_PROT_READ, VM_PROT_READ, 0, (caddr_t)vp, trunc_page(file_offset)); if (error) goto cleanup; diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 9574363..60a324c 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -26,7 +26,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: imgact_elf.c,v 1.2 1996/03/10 22:37:34 peter Exp $ + * $Id: imgact_elf.c,v 1.3 1996/03/10 23:44:40 peter Exp $ */ #include <sys/param.h> @@ -154,7 +154,7 @@ map_pages(struct vnode *vp, vm_offset_t offset, size, VM_PROT_READ, VM_PROT_READ, - MAP_FILE, + 0, (caddr_t)vp, offset)) return error; @@ -272,7 +272,7 @@ elf_load_section(struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, map_len, prot, VM_PROT_ALL, - MAP_FILE | MAP_PRIVATE | MAP_FIXED, + MAP_PRIVATE | MAP_FIXED, (caddr_t)vp, trunc_page(offset))) return error; @@ -301,7 +301,7 @@ elf_load_section(struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, PAGE_SIZE, VM_PROT_READ, VM_PROT_READ, - MAP_FILE, + 0, (caddr_t)vp, trunc_page(offset + filsz))) return error; |