From: Jiri Kosina Date: Fri, 29 Jun 2012 12:45:58 +0000 (+0200) Subject: Merge branch 'master' into for-next X-Git-Tag: upstream/snapshot3+hdmi~6990^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.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 --- 59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 diff --cc include/linux/mmzone.h index 5463177,1b89861..588c5cb --- 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) */