From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 23 Jan 2017 04:28:47 +0000 (+0000)
Subject: memcg: Avoid ABI change in 4.9.5
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~11^2^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b3b1f28ef8186d8297690488e5103bf1f1ecfaa0;p=linux-4.9.git

memcg: Avoid ABI change in 4.9.5

struct mem_cgroup_per_node was changed by commit b4536f0c829c
"mm, memcg: fix the active list aging for lowmem requests when
memcg is enabled", backported into 4.9.5.  This structure
isn't used by modules, so hide the change.


Gbp-Pq: Topic debian
Gbp-Pq: Name memcg-avoid-abi-change-in-4.9.5.patch
---

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 254698856b8f..e433b1721fa4 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -120,7 +120,11 @@ struct mem_cgroup_reclaim_iter {
  */
 struct mem_cgroup_per_node {
 	struct lruvec		lruvec;
+#ifdef __GENKSYMS__
+	unsigned long		lru_size[NR_LRU_LISTS];
+#else
 	unsigned long		lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS];
+#endif
 
 	struct mem_cgroup_reclaim_iter	iter[DEF_PRIORITY + 1];