Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:51:06 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: mm.h
Log Message:
Use e_vm_default_addr to choose a default address in Linux vm_mmap.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/external/bsd/drm2/include/linux/mm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/mm.h
diff -u src/sys/external/bsd/drm2/include/linux/mm.h:1.1.2.2 src/sys/external/bsd/drm2/include/linux/mm.h:1.1.2.3
--- src/sys/external/bsd/drm2/include/linux/mm.h:1.1.2.2 Wed Jul 24 02:04:31 2013
+++ src/sys/external/bsd/drm2/include/linux/mm.h Wed Jul 24 02:51:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.h,v 1.1.2.2 2013/07/24 02:04:31 riastradh Exp $ */
+/* $NetBSD: mm.h,v 1.1.2.3 2013/07/24 02:51:06 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@ vm_mmap(struct file *file, unsigned long
unsigned long prot, unsigned long flags, unsigned long token)
{
struct vnode *vnode;
- vaddr_t addr = 0;
+ vaddr_t addr;
int error;
/*
@@ -94,6 +94,8 @@ vm_mmap(struct file *file, unsigned long
/* XXX pax_mprotect? pax_aslr? */
+ addr = (*curproc->p_emul->e_vm_default_addr)(curproc,
+ (vaddr_t)curproc->p_vmspace->vm_daddr, size);
error = uvm_mmap(&curproc->p_vmspace->vm_map, &addr, size,
(VM_PROT_READ | VM_PROT_WRITE), (VM_PROT_READ | VM_PROT_WRITE),
MAP_SHARED, vnode, base,
