66c66
< __FBSDID("$FreeBSD: head/sys/vm/vm_kern.c 238561 2012-07-18 05:21:34Z alc $");
---
> __FBSDID("$FreeBSD: head/sys/vm/vm_kern.c 243040 2012-11-14 20:01:40Z kib $");
225,230c225
< if ((flags & (M_NOWAIT | M_USE_RESERVE)) == M_NOWAIT)
< pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_NOBUSY;
< else
< pflags = VM_ALLOC_SYSTEM | VM_ALLOC_NOBUSY;
< if (flags & M_ZERO)
< pflags |= VM_ALLOC_ZERO;
---
> pflags = malloc2vm_flags(flags) | VM_ALLOC_NOBUSY;
299,306c294
< if ((flags & (M_NOWAIT | M_USE_RESERVE)) == M_NOWAIT)
< pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_NOBUSY;
< else
< pflags = VM_ALLOC_SYSTEM | VM_ALLOC_NOBUSY;
< if (flags & M_ZERO)
< pflags |= VM_ALLOC_ZERO;
< if (flags & M_NODUMP)
< pflags |= VM_ALLOC_NODUMP;
---
> pflags = malloc2vm_flags(flags) | VM_ALLOC_NOBUSY;
490,493c478
< if ((flags & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT)
< pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED;
< else
< pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED;
---
> pflags = malloc2vm_flags(flags) | VM_ALLOC_WIRED;
495,499d479
< if (flags & M_ZERO)
< pflags |= VM_ALLOC_ZERO;
< if (flags & M_NODUMP)
< pflags |= VM_ALLOC_NODUMP;
<