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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3581C433FE for ; Wed, 11 May 2022 19:22:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3663D6B0073; Wed, 11 May 2022 15:22:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EEA96B0074; Wed, 11 May 2022 15:22:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16A1D6B0078; Wed, 11 May 2022 15:22:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0152B6B0073 for ; Wed, 11 May 2022 15:22:50 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C0DB328AC0 for ; Wed, 11 May 2022 19:22:50 +0000 (UTC) X-FDA: 79454434500.11.98320D0 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id 4A78FC00B0 for ; Wed, 11 May 2022 19:22:48 +0000 (UTC) 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 dfw.source.kernel.org (Postfix) with ESMTPS id F291B610A1; Wed, 11 May 2022 19:22:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39142C340EE; Wed, 11 May 2022 19:22:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1652296968; bh=89dO1SHzQzwJDxkPJtRO7cKNAHULhicNiKr/szwgcZ4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=VteasU/XEScRJom6rva5SHg2taUG3jPHueNEv3b/inAMDOJDF9TIOjapQ7mbJKy/H 86b5xY47ROVR3V4BMKXFQRXAK8J1TnMRX/mWyRFp7FQrdFEX1ZzFvPNck53Jjoi4B3 ofbRjnbKD6/qfdKMIwxZz+dFx1b03FBGt1zc+E88= Date: Wed, 11 May 2022 12:22:47 -0700 From: Andrew Morton To: kernel test robot Cc: Johannes Weiner , llvm@lists.linux.dev, kbuild-all@lists.01.org, Linux Memory Management List Subject: Re: [linux-next:master 10902/11094] mm/memcontrol.c:7467:6: error: redefinition of 'obj_cgroup_may_zswap' Message-Id: <20220511122247.8eff682405531c6e7a9a8181@linux-foundation.org> In-Reply-To: <202205120115.D6nVZNke-lkp@intel.com> References: <202205120115.D6nVZNke-lkp@intel.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b="VteasU/X"; dmarc=none; spf=pass (imf22.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 4A78FC00B0 X-Rspam-User: X-Stat-Signature: 9nacujfk3i1n74p3bfrthowu9wth1fg3 X-HE-Tag: 1652296968-729103 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, 12 May 2022 01:49:04 +0800 kernel test robot wrote: > tree: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master > head: 6107040c99d5dfc920721c198d45ed2d639b113a > commit: bf7930005b547c94d4cd312a2e0400cb8cf76d2a [10902/11094] zswap: memcg accounting > config: i386-randconfig-a001-20220509 (https://download.01.org/0day-ci/archive/20220512/202205120115.D6nVZNke-lkp@intel.com/config) > compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 18dd123c56754edf62c7042dcf23185c3727610f) > reproduce (this is a W=1 build): > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross > chmod +x ~/bin/make.cross > # https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=bf7930005b547c94d4cd312a2e0400cb8cf76d2a > git remote add linux-next https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > git fetch --no-tags linux-next master > git checkout bf7930005b547c94d4cd312a2e0400cb8cf76d2a > # save the config file > mkdir build_dir && cp config build_dir/.config > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash > > If you fix the issue, kindly add following tag as appropriate > Reported-by: kernel test robot > > All errors (new ones prefixed by >>): > > >> mm/memcontrol.c:7467:6: error: redefinition of 'obj_cgroup_may_zswap' > bool obj_cgroup_may_zswap(struct obj_cgroup *objcg) > ^ Thanks, this still occurs when the two Kconfig cleanups from that patchset are included, so I did this: --- 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; _