From 6787dce09db11b7949976adb6a3e2a31ba73cc8c Mon Sep 17 00:00:00 2001 From: Oliver Pinter Date: Fri, 3 Jul 2015 01:41:34 +0200 Subject: [PATCH] HBSD ASLR: fix merge conflict in vm/vm_mmap.c Signed-off-by: Oliver Pinter --- sys/vm/vm_mmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 688908767e25..7dad4c2954a6 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -333,16 +333,13 @@ sys_mmap(td, uap) addr < round_page((vm_offset_t)vms->vm_daddr + lim_max(td, RLIMIT_DATA)))) addr = round_page((vm_offset_t)vms->vm_daddr + -<<<<<<< HEAD - lim_max_proc(td->td_proc, RLIMIT_DATA)); + lim_max(td, RLIMIT_DATA)); #ifdef PAX_ASLR + PROC_LOCK(td->td_proc); pax_aslr_mmap(td->td_proc, &addr, (vm_offset_t)uap->addr, flags); pax_aslr_done = 1; -#endif PROC_UNLOCK(td->td_proc); -======= - lim_max(td, RLIMIT_DATA)); ->>>>>>> origin/master +#endif } if (size == 0) { /*