aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Tkhai <ktkhai@virtuozzo.com>2018-08-17 18:47:33 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-17 19:20:30 -0400
commitb05706f1001fe662bafe198814c5999fd996dce0 (patch)
tree410cd6b75b91449ed8e26e9d70f04256fc00422d
parentb4c2b231c3ba155623591fb6301ed97b95e1c039 (diff)
mm/memcontrol.c: move up for_each_mem_cgroup{, _tree} defines
Next patch requires these defines are above their current position, so here they are moved to declarations. Link: http://lkml.kernel.org/r/153063055665.1818.5200425793649695598.stgit@localhost.localdomain Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com> Tested-by: Shakeel Butt <shakeelb@google.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guenter Roeck <linux@roeck-us.net> Cc: "Huang, Ying" <ying.huang@intel.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Josef Bacik <jbacik@fb.com> Cc: Li RongQing <lirongqing@baidu.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Matthias Kaehlcke <mka@chromium.org> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Michal Hocko <mhocko@kernel.org> Cc: Minchan Kim <minchan@kernel.org> Cc: Philippe Ombredanne <pombredanne@nexb.com> Cc: Roman Gushchin <guro@fb.com> Cc: Sahitya Tummala <stummala@codeaurora.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Waiman Long <longman@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memcontrol.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 2f00b455080f..313355dddf66 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -233,6 +233,21 @@ enum res_type {
233/* Used for OOM nofiier */ 233/* Used for OOM nofiier */
234#define OOM_CONTROL (0) 234#define OOM_CONTROL (0)
235 235
236/*
237 * Iteration constructs for visiting all cgroups (under a tree). If
238 * loops are exited prematurely (break), mem_cgroup_iter_break() must
239 * be used for reference counting.
240 */
241#define for_each_mem_cgroup_tree(iter, root) \
242 for (iter = mem_cgroup_iter(root, NULL, NULL); \
243 iter != NULL; \
244 iter = mem_cgroup_iter(root, iter, NULL))
245
246#define for_each_mem_cgroup(iter) \
247 for (iter = mem_cgroup_iter(NULL, NULL, NULL); \
248 iter != NULL; \
249 iter = mem_cgroup_iter(NULL, iter, NULL))
250
236/* Some nice accessors for the vmpressure. */ 251/* Some nice accessors for the vmpressure. */
237struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg) 252struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg)
238{ 253{
@@ -913,21 +928,6 @@ static void invalidate_reclaim_iterators(struct mem_cgroup *dead_memcg)
913 } 928 }
914} 929}
915 930
916/*
917 * Iteration constructs for visiting all cgroups (under a tree). If
918 * loops are exited prematurely (break), mem_cgroup_iter_break() must
919 * be used for reference counting.
920 */
921#define for_each_mem_cgroup_tree(iter, root) \
922 for (iter = mem_cgroup_iter(root, NULL, NULL); \
923 iter != NULL; \
924 iter = mem_cgroup_iter(root, iter, NULL))
925
926#define for_each_mem_cgroup(iter) \
927 for (iter = mem_cgroup_iter(NULL, NULL, NULL); \
928 iter != NULL; \
929 iter = mem_cgroup_iter(NULL, iter, NULL))
930
931/** 931/**
932 * mem_cgroup_scan_tasks - iterate over tasks of a memory cgroup hierarchy 932 * mem_cgroup_scan_tasks - iterate over tasks of a memory cgroup hierarchy
933 * @memcg: hierarchy root 933 * @memcg: hierarchy root