The patch titled
memcg: correct memcg_hierarchical_free_pages() return type
has been removed from the -mm tree. Its filename was
memcg-add-dirty-limits-to-mem_cgroup-correct-memcg_hierarchical_free_pages-return-type.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcg: correct memcg_hierarchical_free_pages() return type
From: Greg Thelen <gthelen@xxxxxxxxxx>
memcg_hierarchical_free_pages() returns a page count and thus should
return unsigned long to be consistent with the rest of mm code.
Signed-off-by: Greg Thelen <gthelen@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Dave Young <hidave.darkstar@xxxxxxxxx>
Cc: Andrea Righi <arighi@xxxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: Minchan Kim <minchan.kim@xxxxxxxxx>
Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/memcontrol.c~memcg-add-dirty-limits-to-mem_cgroup-correct-memcg_hierarchical_free_pages-return-type mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-add-dirty-limits-to-mem_cgroup-correct-memcg_hierarchical_free_pages-return-type
+++ a/mm/memcontrol.c
@@ -1316,7 +1316,7 @@ static s64 mem_cgroup_local_page_stat(st
* use_hierarchy is set, then this involves parent mem cgroups to find the
* cgroup with the smallest free space.
*/
-static unsigned long long
+static unsigned long
memcg_hierarchical_free_pages(struct mem_cgroup *mem)
{
unsigned long free, min_free;
_
Patches currently in -mm which might be from gthelen@xxxxxxxxxx are
linux-next.patch
memcg-res_counter_read_u64-fix-potential-races-on-32-bit-machines.patch
memcg-break-out-event-counters-from-other-stats.patch
memcg-use-native-word-page-statistics-counters.patch
mm-memcontrolc-suppress-uninitializer-var-warning-with-older-gccs.patch
memcg-document-cgroup-dirty-memory-interfaces.patch
memcg-add-page_cgroup-flags-for-dirty-page-tracking.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
