Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
include/linux/mmzone.h between commit 89abfab133ef ("mm/memcg: move
reclaim_stat into lruvec") from Linus' tree and commit 46028e6d10cb ("mm:
cleanup on the comments of zone_reclaim_stat") from the trivial tree.
The former moved the code that was updated by the latter. I applied the
latter to the new position (see below).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/mmzone.h
index 2427706,5463177..0000000
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@@ -185,25 -185,8 +185,25 @@@ 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;
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+ struct zone *zone;
+#endif
};
/* Mask used at gathering information at once (see memcontrol.c) */
Attachment:
pgpRGMMdxBzwe.pgp
Description: PGP signature
