Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / vmpressure.c

diff --git a/mm/vmpressure.c b/mm/vmpressure.c
index 736a6011c2c88606cc7908fe429b14823be18625..e8955f96df5a4cee828c88bd40f4286ffdb3fdc3 100644 (file)
--- a/mm/vmpressure.c
+++ b/mm/vmpressure.c
@@ -116,8 +116,15 @@ static enum vmpressure_levels vmpressure_calc_level(unsigned long scanned,
                                                    unsigned long reclaimed)
 {
        unsigned long scale = scanned + reclaimed;
-       unsigned long pressure;
+       unsigned long pressure = 0;
 
+       /*
+        * reclaimed can be greater than scanned in cases
+        * like THP, where the scanned is 1 and reclaimed
+        * could be 512
+        */
+       if (reclaimed >= scanned)
+               goto out;
        /*
         * We calculate the ratio (in percents) of how many pages were
         * scanned vs. reclaimed in a given time frame (window). Note that
@@ -128,6 +135,7 @@ static enum vmpressure_levels vmpressure_calc_level(unsigned long scanned,
        pressure = scale - (reclaimed * scale / scanned);
        pressure = pressure * 100 / scale;
 
+out:
        pr_debug("%s: %3lu  (s: %lu  r: %lu)\n", __func__, pressure,
                 scanned, reclaimed);