Merge branch 'akpm-current/current'

[karo-tx-linux.git] / arch / arm / xen / mm.c

diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
index 7c34f7126b046abe9d61637a1716a2ae5139bfe5..c5f9a9e3d1f393daa161ce8349c820462870a942 100644 (file)
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
@@ -25,7 +25,7 @@
 unsigned long xen_get_swiotlb_free_pages(unsigned int order)
 {
        struct memblock_region *reg;
-       gfp_t flags = __GFP_NOWARN;
+       gfp_t flags = __GFP_NOWARN|__GFP_KSWAPD_RECLAIM;
 
        for_each_memblock(memory, reg) {
                if (reg->base < (phys_addr_t)0xffffffff) {