From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58856C433F5 for ; Wed, 11 May 2022 19:23:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346757AbiEKTW7 (ORCPT ); Wed, 11 May 2022 15:22:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346762AbiEKTW4 (ORCPT ); Wed, 11 May 2022 15:22:56 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 790E35DE5E for ; Wed, 11 May 2022 12:22:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id C62C1CE26F6 for ; Wed, 11 May 2022 19:22:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 157AFC340EE; Wed, 11 May 2022 19:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1652296971; bh=/7htPNC7bHdTms/PDlQzcfGRLLG37SVokcKUEZxDXJY=; h=Date:To:From:Subject:From; b=Wg6CEaxZXlyG72tR53rsCbBYzebAZCKaGNSQHKVl1hkwOJgj9ma0cvlJfaNsiH6if n0lwkpOT2X5Z/R+1exDQMvtGtOVT7GEz9E4uo0mKT7ISI80HJ1XY6B4njKit/sO9qG WeCB4widoHNNJNWkehdvV2bRFNGQXtu08Iydx3fM= Date: Wed, 11 May 2022 12:22:50 -0700 To: mm-commits@vger.kernel.org, sjenning@redhat.com, shakeelb@google.com, sfr@canb.auug.org.au, minchan@kernel.org, mhocko@suse.com, lkp@intel.com, hannes@cmpxchg.org, guro@fb.com, ddstreet@ieee.org, akpm@linux-foundation.org, akpm@linux-foundation.org From: Andrew Morton Subject: + zswap-memcg-accounting-fix.patch added to mm-unstable branch Message-Id: <20220511192251.157AFC340EE@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: zswap-memcg-accounting-fix has been added to the -mm mm-unstable branch. Its filename is zswap-memcg-accounting-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/zswap-memcg-accounting-fix.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Andrew Morton Subject: zswap-memcg-accounting-fix fix build Reported-by: kernel test robot Cc: Dan Streetman Cc: Johannes Weiner Cc: Michal Hocko Cc: Minchan Kim Cc: Roman Gushchin Cc: Seth Jennings Cc: Shakeel Butt Cc: Stephen Rothwell Signed-off-by: Andrew Morton --- mm/memcontrol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/memcontrol.c~zswap-memcg-accounting-fix +++ a/mm/memcontrol.c @@ -7451,7 +7451,7 @@ static struct cftype memsw_files[] = { { }, /* terminate */ }; -#ifdef CONFIG_ZSWAP +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) /** * obj_cgroup_may_zswap - check if this cgroup can zswap * @objcg: the object cgroup @@ -7582,7 +7582,7 @@ static struct cftype zswap_files[] = { }, { } /* terminate */ }; -#endif /* CONFIG_ZSWAP */ +#endif /* CONFIG_MEMCG_KMEM && CONFIG_ZSWAP */ /* * If mem_cgroup_swap_init() is implemented as a subsys_initcall() @@ -7602,7 +7602,7 @@ static int __init mem_cgroup_swap_init(v WARN_ON(cgroup_add_dfl_cftypes(&memory_cgrp_subsys, swap_files)); WARN_ON(cgroup_add_legacy_cftypes(&memory_cgrp_subsys, memsw_files)); -#ifdef CONFIG_ZSWAP +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) WARN_ON(cgroup_add_dfl_cftypes(&memory_cgrp_subsys, zswap_files)); #endif return 0; _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm-check-against-orig_pte-for-finish_fault-fix-checkpatch-fixes.patch mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix.patch lib-kstrtoxc-add-false-true-support-to-kstrtobool-fix.patch mm-start-tracking-vmas-with-maple-tree-fix.patch damon-convert-__damon_va_three_regions-to-use-the-vma-iterator-fix.patch zswap-memcg-accounting-fix.patch mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch