Deleted Added
full compact
75c75
< __FBSDID("$FreeBSD: releng/10.3/sys/vm/vm_fault.c 286362 2015-08-06 08:51:15Z kib $");
---
> __FBSDID("$FreeBSD: releng/10.3/sys/vm/vm_fault.c 307929 2016-10-25 16:45:55Z glebius $");
289c289
< boolean_t growstack, is_first_object_locked, wired;
---
> boolean_t dead, growstack, is_first_object_locked, wired;
426c426,429
< * If the object is dead, we stop here
---
> * If the object is marked for imminent termination,
> * we retry here, since the collapse pass has raced
> * with us. Otherwise, if we see terminally dead
> * object, return fail.
428c431,432
< if (fs.object->flags & OBJ_DEAD) {
---
> if ((fs.object->flags & OBJ_DEAD) != 0) {
> dead = fs.object->type == OBJT_DEAD;
430c434,437
< return (KERN_PROTECTION_FAILURE);
---
> if (dead)
> return (KERN_PROTECTION_FAILURE);
> pause("vmf_de", 1);
> goto RetryFault;