From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [folded] memcg-prevent-endless-loop-when-charging-huge-pages-to-near-limit-group-fix-fix.patch removed from -mm tree Date: Tue, 01 Feb 2011 15:48:25 -0800 Message-ID: <201102012348.p11NmPBu005691@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:52809 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307Ab1BAXtB (ORCPT ); Tue, 1 Feb 2011 18:49:01 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: hannes@cmpxchg.org, balbir@linux.vnet.ibm.com, kamezawa.hiroyu@jp.fujitsu.com, minchan.kim@gmail.com, nishimura@mxp.nes.nec.co.jp, mm-commits@vger.kernel.org The patch titled memcg-prevent-endless-loop-when-charging-huge-pages-to-near-limit-group-fix-fix has been removed from the -mm tree. Its filename was memcg-prevent-endless-loop-when-charging-huge-pages-to-near-limit-group-fix-fix.patch This patch was dropped because it was folded into memcg-prevent-endless-loop-when-charging-huge-pages-to-near-limit-group.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memcg-prevent-endless-loop-when-charging-huge-pages-to-near-limit-group-fix-fix From: Johannes Weiner *oink* Signed-off-by: Johannes Weiner Cc: KAMEZAWA Hiroyuki Cc: Minchan Kim Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton --- mm/memcontrol.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff -puN mm/memcontrol.c~memcg-prevent-endless-loop-when-charging-huge-pages-to-near-limit-group-fix-fix mm/memcontrol.c --- a/mm/memcontrol.c~memcg-prevent-endless-loop-when-charging-huge-pages-to-near-limit-group-fix-fix +++ a/mm/memcontrol.c @@ -1111,6 +1111,14 @@ static bool mem_cgroup_check_under_limit return false; } +/** + * mem_cgroup_check_margin - check if the memory cgroup allows charging + * @mem: memory cgroup to check + * @bytes: the number of bytes the caller intends to charge + * + * Returns a boolean value on whether @mem can be charged @bytes or + * whether this would exceed the limit. + */ static bool mem_cgroup_check_margin(struct mem_cgroup *mem, unsigned long bytes) { if (!res_counter_check_margin(&mem->res, bytes)) _ Patches currently in -mm which might be from hannes@cmpxchg.org are memcg-prevent-endless-loop-when-charging-huge-pages.patch memcg-prevent-endless-loop-when-charging-huge-pages-to-near-limit-group.patch memcg-never-oom-when-charging-huge-pages.patch memcg-fix-event-counting-breakage-by-recent-thp-update.patch epoll-fix-compiler-warning-and-optimize-the-non-blocking-path-fix.patch memcg-res_counter_read_u64-fix-potential-races-on-32-bit-machines.patch memcg-fix-ugly-initialization-of-return-value-is-in-caller.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn-fix.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn-fix-fix.patch