From 0c6a615d41bcae16ca7d8ee2667d3c4490a142d5 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Tue, 21 Dec 2010 17:24:18 -0800
Subject: [PATCH] --- yaml --- r: 223504 b: refs/heads/master c:
 7a2d19bced51af31d2c9ff55219400ed0a6c012f h: refs/heads/master v: v3

---
 [refs]                                                |  2 +-
 .../trace/postprocess/trace-vmscan-postprocess.pl     | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef733e53f4c8..b073a8d7e5cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd9e5efe3aa9fc5b1ce484a531ecdba3a7a30bbf
+refs/heads/master: 7a2d19bced51af31d2c9ff55219400ed0a6c012f
diff --git a/trunk/Documentation/trace/postprocess/trace-vmscan-postprocess.pl b/trunk/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
index b3e73ddb1567..12cecc83cd91 100644
--- a/trunk/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
+++ b/trunk/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
@@ -373,9 +373,18 @@ sub process_events {
 				print "         $regex_lru_isolate/o\n";
 				next;
 			}
+			my $isolate_mode = $1;
 			my $nr_scanned = $4;
 			my $nr_contig_dirty = $7;
-			$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;
+
+			# To closer match vmstat scanning statistics, only count isolate_both
+			# and isolate_inactive as scanning. isolate_active is rotation
+			# isolate_inactive == 0
+			# isolate_active   == 1
+			# isolate_both     == 2
+			if ($isolate_mode != 1) {
+				$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;
+			}
 			$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;
 		} elsif ($tracepoint eq "mm_vmscan_lru_shrink_inactive") {
 			$details = $5;