diff options
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r-- | include/linux/memcontrol.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 6d2321c148cd..f4963ee4fdbc 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -324,22 +324,23 @@ mem_cgroup_zone_zoneinfo(struct mem_cgroup *memcg, struct zone *zone) | |||
324 | } | 324 | } |
325 | 325 | ||
326 | /** | 326 | /** |
327 | * mem_cgroup_zone_lruvec - get the lru list vector for a zone and memcg | 327 | * mem_cgroup_lruvec - get the lru list vector for a node or a memcg zone |
328 | * @node: node of the wanted lruvec | ||
328 | * @zone: zone of the wanted lruvec | 329 | * @zone: zone of the wanted lruvec |
329 | * @memcg: memcg of the wanted lruvec | 330 | * @memcg: memcg of the wanted lruvec |
330 | * | 331 | * |
331 | * Returns the lru list vector holding pages for the given @zone and | 332 | * Returns the lru list vector holding pages for a given @node or a given |
332 | * @mem. This can be the global zone lruvec, if the memory controller | 333 | * @memcg and @zone. This can be the node lruvec, if the memory controller |
333 | * is disabled. | 334 | * is disabled. |
334 | */ | 335 | */ |
335 | static inline struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone, | 336 | static inline struct lruvec *mem_cgroup_lruvec(struct pglist_data *pgdat, |
336 | struct mem_cgroup *memcg) | 337 | struct zone *zone, struct mem_cgroup *memcg) |
337 | { | 338 | { |
338 | struct mem_cgroup_per_zone *mz; | 339 | struct mem_cgroup_per_zone *mz; |
339 | struct lruvec *lruvec; | 340 | struct lruvec *lruvec; |
340 | 341 | ||
341 | if (mem_cgroup_disabled()) { | 342 | if (mem_cgroup_disabled()) { |
342 | lruvec = zone_lruvec(zone); | 343 | lruvec = node_lruvec(pgdat); |
343 | goto out; | 344 | goto out; |
344 | } | 345 | } |
345 | 346 | ||
@@ -609,10 +610,10 @@ static inline void mem_cgroup_migrate(struct page *old, struct page *new) | |||
609 | { | 610 | { |
610 | } | 611 | } |
611 | 612 | ||
612 | static inline struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone, | 613 | static inline struct lruvec *mem_cgroup_lruvec(struct pglist_data *pgdat, |
613 | struct mem_cgroup *memcg) | 614 | struct zone *zone, struct mem_cgroup *memcg) |
614 | { | 615 | { |
615 | return zone_lruvec(zone); | 616 | return node_lruvec(pgdat); |
616 | } | 617 | } |
617 | 618 | ||
618 | static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page, | 619 | static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page, |