| uma_machdep.c (302408) | uma_machdep.c (327785) |
|---|---|
| 1/*- 2 * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: stable/11/sys/amd64/amd64/uma_machdep.c 295451 2016-02-09 20:22:35Z glebius $"); | 28__FBSDID("$FreeBSD: stable/11/sys/amd64/amd64/uma_machdep.c 327785 2018-01-10 20:39:26Z markj $"); |
| 29 30#include <sys/param.h> 31#include <sys/lock.h> 32#include <sys/malloc.h> 33#include <sys/mutex.h> 34#include <sys/systm.h> 35#include <vm/vm.h> 36#include <vm/vm_page.h> --- 4 unchanged lines hidden (view full) --- 41#include <machine/vmparam.h> 42 43void * 44uma_small_alloc(uma_zone_t zone, vm_size_t bytes, u_int8_t *flags, int wait) 45{ 46 vm_page_t m; 47 vm_paddr_t pa; 48 void *va; | 29 30#include <sys/param.h> 31#include <sys/lock.h> 32#include <sys/malloc.h> 33#include <sys/mutex.h> 34#include <sys/systm.h> 35#include <vm/vm.h> 36#include <vm/vm_page.h> --- 4 unchanged lines hidden (view full) --- 41#include <machine/vmparam.h> 42 43void * 44uma_small_alloc(uma_zone_t zone, vm_size_t bytes, u_int8_t *flags, int wait) 45{ 46 vm_page_t m; 47 vm_paddr_t pa; 48 void *va; |
| 49 int pflags; | |
| 50 51 *flags = UMA_SLAB_PRIV; | 49 50 *flags = UMA_SLAB_PRIV; |
| 52 pflags = malloc2vm_flags(wait) | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED; 53 for (;;) { 54 m = vm_page_alloc(NULL, 0, pflags); 55 if (m == NULL) { 56 if (wait & M_NOWAIT) 57 return (NULL); 58 else 59 VM_WAIT; 60 } else 61 break; 62 } | 51 m = vm_page_alloc(NULL, 0, 52 malloc2vm_flags(wait) | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED); 53 if (m == NULL) 54 return (NULL); |
| 63 pa = m->phys_addr; 64 if ((wait & M_NODUMP) == 0) 65 dump_add_page(pa); 66 va = (void *)PHYS_TO_DMAP(pa); 67 if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) 68 pagezero(va); 69 return (va); 70} --- 14 unchanged lines hidden --- | 55 pa = m->phys_addr; 56 if ((wait & M_NODUMP) == 0) 57 dump_add_page(pa); 58 va = (void *)PHYS_TO_DMAP(pa); 59 if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) 60 pagezero(va); 61 return (va); 62} --- 14 unchanged lines hidden --- |