X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=kernel%2Flinux%2Fmm%2Fvmscan.c;h=04699a8e8f4f7c1cd4b9e02f6f9a45cf798a5965;hp=48eccbf75db469728643a436a9ef0e238f1782ec;hb=6adeba4d92a546ebbadde2562283ee6b984b22c1;hpb=a69849c98808437716b821267cd97529c56f45b0

diff --git a/kernel/linux/mm/vmscan.c b/kernel/linux/mm/vmscan.c
index 48eccbf7..04699a8e 100755
--- a/kernel/linux/mm/vmscan.c
+++ b/kernel/linux/mm/vmscan.c
@@ -949,11 +949,7 @@ int try_to_free_pages(struct zone **zones,
 			blk_congestion_wait(WRITE, HZ/10);
 	}
 	if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY))
-#if defined(CONFIG_MIPS_BRCM)
-#else
 		out_of_memory(gfp_mask);
-#endif
-
 out:
 	for (i = 0; zones[i] != 0; i++)
 		zones[i]->prev_priority = zones[i]->temp_priority;
@@ -1069,6 +1065,7 @@ scan:
 			shrink_slab(sc.nr_scanned, GFP_KERNEL, lru_pages);
 			sc.nr_reclaimed += reclaim_state->reclaimed_slab;
 			total_reclaimed += sc.nr_reclaimed;
+			total_scanned += sc.nr_scanned;
 			if (zone->all_unreclaimable)
 				continue;
 			if (zone->pages_scanned > zone->present_pages * 2)