diff options
-rw-r--r-- | arch/sparc/kernel/ioport.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/sbus.c | 2 | ||||
-rw-r--r-- | sound/core/memalloc.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index d0f2bd227c4c..d39c9f206271 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
@@ -252,7 +252,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp) | |||
252 | } | 252 | } |
253 | 253 | ||
254 | order = get_order(len_total); | 254 | order = get_order(len_total); |
255 | if ((va = __get_free_pages(GFP_KERNEL, order)) == 0) | 255 | if ((va = __get_free_pages(GFP_KERNEL|__GFP_COMP, order)) == 0) |
256 | goto err_nopages; | 256 | goto err_nopages; |
257 | 257 | ||
258 | if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) | 258 | if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) |
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index 96b825055668..d95a1bcf163d 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c | |||
@@ -327,7 +327,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, size_t size, dma_addr_t *dvma | |||
327 | order = get_order(size); | 327 | order = get_order(size); |
328 | if (order >= 10) | 328 | if (order >= 10) |
329 | return NULL; | 329 | return NULL; |
330 | first_page = __get_free_pages(GFP_KERNEL, order); | 330 | first_page = __get_free_pages(GFP_KERNEL|__GFP_COMP, order); |
331 | if (first_page == 0UL) | 331 | if (first_page == 0UL) |
332 | return NULL; | 332 | return NULL; |
333 | memset((char *)first_page, 0, PAGE_SIZE << order); | 333 | memset((char *)first_page, 0, PAGE_SIZE << order); |
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 129abab5ce98..e4b8959dd4bb 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c | |||
@@ -197,6 +197,7 @@ void *snd_malloc_pages(size_t size, gfp_t gfp_flags) | |||
197 | 197 | ||
198 | snd_assert(size > 0, return NULL); | 198 | snd_assert(size > 0, return NULL); |
199 | snd_assert(gfp_flags != 0, return NULL); | 199 | snd_assert(gfp_flags != 0, return NULL); |
200 | gfp_flags |= __GFP_COMP; /* compound page lets parts be mapped */ | ||
200 | pg = get_order(size); | 201 | pg = get_order(size); |
201 | if ((res = (void *) __get_free_pages(gfp_flags, pg)) != NULL) { | 202 | if ((res = (void *) __get_free_pages(gfp_flags, pg)) != NULL) { |
202 | mark_pages(virt_to_page(res), pg); | 203 | mark_pages(virt_to_page(res), pg); |
@@ -241,6 +242,7 @@ static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *d | |||
241 | snd_assert(dma != NULL, return NULL); | 242 | snd_assert(dma != NULL, return NULL); |
242 | pg = get_order(size); | 243 | pg = get_order(size); |
243 | gfp_flags = GFP_KERNEL | 244 | gfp_flags = GFP_KERNEL |
245 | | __GFP_COMP /* compound page lets parts be mapped */ | ||
244 | | __GFP_NORETRY /* don't trigger OOM-killer */ | 246 | | __GFP_NORETRY /* don't trigger OOM-killer */ |
245 | | __GFP_NOWARN; /* no stack trace print - this call is non-critical */ | 247 | | __GFP_NOWARN; /* no stack trace print - this call is non-critical */ |
246 | res = dma_alloc_coherent(dev, PAGE_SIZE << pg, dma, gfp_flags); | 248 | res = dma_alloc_coherent(dev, PAGE_SIZE << pg, dma, gfp_flags); |