X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=mm%2Fksm.c;h=5048083b60f23bb2f0f78af969d6aa5df39aebfd;hb=d24cd733bae8fc6c121c437b3197ab7f3930ca66;hp=73d43bafd9fbc41ad322b9d26e80e548481a23b4;hpb=4a1ff03faf0562665c5b0d7130658bf13d65426e;p=cascardo%2Flinux.git

diff --git a/mm/ksm.c b/mm/ksm.c
index 73d43bafd9fb..5048083b60f2 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -283,7 +283,8 @@ static inline struct rmap_item *alloc_rmap_item(void)
 {
 	struct rmap_item *rmap_item;
 
-	rmap_item = kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL);
+	rmap_item = kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL |
+						__GFP_NORETRY | __GFP_NOWARN);
 	if (rmap_item)
 		ksm_rmap_items++;
 	return rmap_item;