patch-2.1.93 linux/mm/page_alloc.c

• Lines: 15
• Date: Sat Apr 4 09:26:23 1998
• Orig file: v2.1.92/linux/mm/page_alloc.c
• Orig date: Wed Apr 1 20:11:55 1998

diff -u --recursive --new-file v2.1.92/linux/mm/page_alloc.c linux/mm/page_alloc.c
@@ -292,8 +292,12 @@
 	spin_lock_irqsave(&page_alloc_lock, flags);
 	RMQUEUE(order, maxorder, (gfp_mask & GFP_DMA));
 	spin_unlock_irqrestore(&page_alloc_lock, flags);
-	if ((gfp_mask & __GFP_WAIT) && try_to_free_pages(gfp_mask,SWAP_CLUSTER_MAX))
-		goto repeat;
+	if (gfp_mask & __GFP_WAIT) {
+		int freed = try_to_free_pages(gfp_mask,SWAP_CLUSTER_MAX);
+		gfp_mask &= ~__GFP_WAIT;	/* go through this only once */
+		if (freed)
+			goto repeat;
+	}
 nopage:
 	return 0;
 }