From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 29 Jun 2012 12:45:58 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'master' into for-next

Conflicts:
	include/linux/mmzone.h

Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266
diff --cc include/linux/mmzone.h
index 54631776dff2,1b89861eedc0..588c5cb2851d
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@@ -185,8 -185,22 +185,22 @@@ static inline int is_unevictable_lru(en
  	return (lru == LRU_UNEVICTABLE);
  }
  
+ struct zone_reclaim_stat {
+ 	/*
+ 	 * The pageout code in vmscan.c keeps track of how many of the
 -	 * mem/swap backed and file backed pages are refeferenced.
++	 * mem/swap backed and file backed pages are referenced.
+ 	 * The higher the rotated/scanned ratio, the more valuable
+ 	 * that cache is.
+ 	 *
+ 	 * The anon LRU stats live in [0], file LRU stats in [1]
+ 	 */
+ 	unsigned long		recent_rotated[2];
+ 	unsigned long		recent_scanned[2];
+ };
+ 
  struct lruvec {
  	struct list_head lists[NR_LRU_LISTS];
+ 	struct zone_reclaim_stat reclaim_stat;
  };
  
  /* Mask used at gathering information at once (see memcontrol.c) */