www.usr.com/support/gpl/USR9113_release1.0.tar.gz

[bcm963xx.git] / kernel / linux / mm / vmscan.c

diff --git a/kernel/linux/mm/vmscan.c b/kernel/linux/mm/vmscan.c
index 48eccbf..04699a8 100755 (executable)
--- 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)