diff options
| author | neel <neel@FreeBSD.org> | 2012-11-17 02:55:47 +0000 |
|---|---|---|
| committer | neel <neel@FreeBSD.org> | 2012-11-17 02:55:47 +0000 |
| commit | 0e18e1b9de7bacfe2cdccb09738c895dfaf0cbf8 (patch) | |
| tree | 2bd9bddaae9e43ae0279e8ef5ed4b4d93aa41eff /sys/amd64 | |
| parent | 1a164db277254c1198a5923050a4e403737937c3 (diff) | |
| parent | 40d9982013b20f7e4359382de92b451264e2233b (diff) | |
| download | FreeBSD-src-0e18e1b9de7bacfe2cdccb09738c895dfaf0cbf8.zip FreeBSD-src-0e18e1b9de7bacfe2cdccb09738c895dfaf0cbf8.tar.gz | |
IFC @ r243164
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/minidump_machdep.c | 1 | ||||
| -rw-r--r-- | sys/amd64/amd64/uma_machdep.c | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c index 9be642e..c1b03c1 100644 --- a/sys/amd64/amd64/minidump_machdep.c +++ b/sys/amd64/amd64/minidump_machdep.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include <sys/watchdog.h> #include <vm/vm.h> #include <vm/vm_page.h> +#include <vm/vm_phys.h> #include <vm/pmap.h> #include <machine/atomic.h> #include <machine/elf.h> diff --git a/sys/amd64/amd64/uma_machdep.c b/sys/amd64/amd64/uma_machdep.c index dc9c307..c4ca677 100644 --- a/sys/amd64/amd64/uma_machdep.c +++ b/sys/amd64/amd64/uma_machdep.c @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/lock.h> +#include <sys/malloc.h> #include <sys/mutex.h> #include <sys/systm.h> #include <vm/vm.h> @@ -48,12 +49,7 @@ uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) int pflags; *flags = UMA_SLAB_PRIV; - if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED; - else - pflags = VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED; - if (wait & M_ZERO) - pflags |= VM_ALLOC_ZERO; + pflags = malloc2vm_flags(wait) | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED; for (;;) { m = vm_page_alloc(NULL, 0, pflags); if (m == NULL) { |
