View | Details | Raw Unified | Return to bug 277476
Collapse All | Expand All

(-)b/sys/compat/linuxkpi/common/include/linux/gfp.h (-2 / +2 lines)
Lines 43-49 Link Here
43
#define	__GFP_NOWARN	0
43
#define	__GFP_NOWARN	0
44
#define	__GFP_HIGHMEM	0
44
#define	__GFP_HIGHMEM	0
45
#define	__GFP_ZERO	M_ZERO
45
#define	__GFP_ZERO	M_ZERO
46
#define	__GFP_NORETRY	0
47
#define	__GFP_NOMEMALLOC 0
46
#define	__GFP_NOMEMALLOC 0
48
#define	__GFP_RECLAIM   0
47
#define	__GFP_RECLAIM   0
49
#define	__GFP_RECLAIMABLE   0
48
#define	__GFP_RECLAIMABLE   0
Lines 57-63 Link Here
57
#define	__GFP_KSWAPD_RECLAIM	0
56
#define	__GFP_KSWAPD_RECLAIM	0
58
#define	__GFP_WAIT	M_WAITOK
57
#define	__GFP_WAIT	M_WAITOK
59
#define	__GFP_DMA32	(1U << 24) /* LinuxKPI only */
58
#define	__GFP_DMA32	(1U << 24) /* LinuxKPI only */
60
#define	__GFP_BITS_SHIFT 25
59
#define	__GFP_NORETRY	(1U << 25) /* LinuxKPI only */
60
#define	__GFP_BITS_SHIFT 26
61
#define	__GFP_BITS_MASK	((1 << __GFP_BITS_SHIFT) - 1)
61
#define	__GFP_BITS_MASK	((1 << __GFP_BITS_SHIFT) - 1)
62
#define	__GFP_NOFAIL	M_WAITOK
62
#define	__GFP_NOFAIL	M_WAITOK
63
63
(-)b/sys/compat/linuxkpi/common/src/linux_page.c (-2 / +1 lines)
Lines 117-123 linux_alloc_pages(gfp_t flags, unsigned int order) Link Here
117
			page = vm_page_alloc_noobj_contig(req, npages, 0, pmax,
117
			page = vm_page_alloc_noobj_contig(req, npages, 0, pmax,
118
			    PAGE_SIZE, 0, VM_MEMATTR_DEFAULT);
118
			    PAGE_SIZE, 0, VM_MEMATTR_DEFAULT);
119
			if (page == NULL) {
119
			if (page == NULL) {
120
				if (flags & M_WAITOK) {
120
				if ((flags & (M_WAITOK | __GFP_NORETRY)) == M_WAITOK) {
121
					int err = vm_page_reclaim_contig(req,
121
					int err = vm_page_reclaim_contig(req,
122
					    npages, 0, pmax, PAGE_SIZE, 0);
122
					    npages, 0, pmax, PAGE_SIZE, 0);
123
					if (err == ENOMEM)
123
					if (err == ENOMEM)
124
- 

Return to bug 277476