diff options
| author | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:05 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:05 -0200 |
| commit | 681a482d8fc4bfc14a24f7a9d75cca6337f2a520 (patch) | |
| tree | 08368e0c4dcea4baa16f4a34b2cc104c42e1ed27 /sys/vm/vm_fault.c | |
| parent | cbeab2a9b6b7ac70992175202f35fcc05a5821d5 (diff) | |
| parent | 91f6edbb8913d163d5c16fb615e84baf8a16d390 (diff) | |
| download | FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.zip FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/vm/vm_fault.c')
| -rw-r--r-- | sys/vm/vm_fault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index b3fd372..0152c1c 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -124,6 +124,7 @@ struct faultstate { vm_map_t map; vm_map_entry_t entry; int lookup_still_valid; + int map_generation; struct vnode *vp; }; @@ -336,7 +337,6 @@ vm_fault_hold(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, long ahead, behind; int alloc_req, era, faultcount, nera, reqpage, result; boolean_t dead, growstack, is_first_object_locked, wired; - int map_generation; vm_object_t next_object; vm_page_t marray[VM_FAULT_READ_MAX]; int hardfault; @@ -372,7 +372,7 @@ RetryFault:; return (result); } - map_generation = fs.map->timestamp; + fs.map_generation = fs.map->timestamp; if (fs.entry->eflags & MAP_ENTRY_NOFAULT) { panic("vm_fault: fault on nofault entry, addr: %lx", @@ -950,7 +950,7 @@ readrest: goto RetryFault; } fs.lookup_still_valid = TRUE; - if (fs.map->timestamp != map_generation) { + if (fs.map->timestamp != fs.map_generation) { result = vm_map_lookup_locked(&fs.map, vaddr, fault_type, &fs.entry, &retry_object, &retry_pindex, &retry_prot, &wired); |
