Date: Wed, 10 Nov 2010 19:03:30 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r215098 - projects/ofed/head/sys/vm Message-ID: <201011101903.oAAJ3UX2034282@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jeff Date: Wed Nov 10 19:03:30 2010 New Revision: 215098 URL: http://svn.freebsd.org/changeset/base/215098 Log: - The entry protection can be READ or EXECUTE for wire to succeed. Discussed with: jhb Modified: projects/ofed/head/sys/vm/vm_map.c Modified: projects/ofed/head/sys/vm/vm_map.c ============================================================================== --- projects/ofed/head/sys/vm/vm_map.c Wed Nov 10 18:50:12 2010 (r215097) +++ projects/ofed/head/sys/vm/vm_map.c Wed Nov 10 19:03:30 2010 (r215098) @@ -2301,7 +2301,7 @@ vm_map_wire(vm_map_t map, vm_offset_t st boolean_t fictitious, need_wakeup, result, user_wire; vm_prot_t prot; - prot = VM_PROT_READ | VM_PROT_EXECUTE; + prot = 0; if (flags & VM_MAP_WIRE_WRITE) prot |= VM_PROT_WRITE; user_wire = (flags & VM_MAP_WIRE_USER) ? TRUE : FALSE; @@ -2371,7 +2371,8 @@ vm_map_wire(vm_map_t map, vm_offset_t st * above.) */ entry->eflags |= MAP_ENTRY_IN_TRANSITION; - if ((entry->protection & prot) != prot) { + if ((entry->protection & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0 + || (entry->protection & prot) != prot) { entry->eflags |= MAP_ENTRY_WIRE_SKIPPED; if ((flags & VM_MAP_WIRE_HOLESOK) == 0) { end = entry->end;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011101903.oAAJ3UX2034282>