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 10109C3DA49 for ; Tue, 23 Jul 2024 21:45:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3AAC6B0083; Tue, 23 Jul 2024 17:45:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9EABA6B0085; Tue, 23 Jul 2024 17:45:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 900846B0088; Tue, 23 Jul 2024 17:45:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7145A6B0083 for ; Tue, 23 Jul 2024 17:45:25 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E20E7160365 for ; Tue, 23 Jul 2024 21:45:24 +0000 (UTC) X-FDA: 82372348968.10.DAB54FD Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id 138A110002E for ; Tue, 23 Jul 2024 21:45:22 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=Cy46kVrh; spf=pass (imf05.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721771099; a=rsa-sha256; cv=none; b=bnEZVx1XcxGYA3vl/nhGctsS+euevgBsskiLwkytqHmY2/J3BdIIrYPLg7ZW03dDsSRja0 cpj5DHaXX6/Qmx82JoMi/oRGzwCbzOcYy4jW34ypZA4dzWyYYXn2qibhx+8bUVxNhjQlLQ 6aFhqDh11Oui1886B2C7hCsamETRZaE= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=Cy46kVrh; spf=pass (imf05.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721771099; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YCp9jqJ3A9wbHDZxVtIaYy4Z8/TaJ3n2XDTKnwe18wY=; b=HtFVHKsCr/Z8bb5qutG+55ahgnW26WZLL0y7tEtFJYRUxasdQ7SGV/+4mEI4/ZC88EbEqI EmFToRz5nVqQn6qtXO2gkIzqAx/ht6LeiJww8pzAob0Biq66ClCDCDLwdlxr8nE1+RojEG FLXwCYwS9EDJF0lW1nVOK8+BkENIYFQ= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A551C60E15; Tue, 23 Jul 2024 21:45:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31246C4AF09; Tue, 23 Jul 2024 21:45:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1721771121; bh=s0Xx4U7QoLp2cO1gIy+fXdv3N2qBOlipTZ8rK4n92dA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Cy46kVrhqxa3GmGlhVtZFjxjrNnDYQwnyojAMUZ9ldz4eMtQX+mG4ibDDjhN5LR5W Uac8seyee5cVuVWa/hZTs7XWGa881rL9voINRrtRXDrnq/NggFIgS/zXCWFW+lPIL9 UmlaI1ivEqRxDcUq0kmmp1hGues3G4X4R63Nb/CQ= Date: Tue, 23 Jul 2024 14:45:20 -0700 From: Andrew Morton To: Zi Yan Cc: kernel test robot , oe-kbuild-all@lists.linux.dev, Linux Memory Management List , "Huang, Ying" Subject: Re: [akpm-mm:mm-unstable 9/30] mm/memory-tiers.c:64:6: error: redefinition of 'folio_has_cpupid' Message-Id: <20240723144520.465d13ed2b48613c43028426@linux-foundation.org> In-Reply-To: <92316F08-AF73-46E6-B82D-E40970CB6E94@nvidia.com> References: <202407240024.Lhu1XDok-lkp@intel.com> <92316F08-AF73-46E6-B82D-E40970CB6E94@nvidia.com> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Stat-Signature: uhcgscncjrnepg97zfea3of4bmdrn1a7 X-Rspamd-Queue-Id: 138A110002E X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1721771122-875855 X-HE-Meta: U2FsdGVkX1/yqoaOBPK7b3hFURbAljYjYgRMS3wdtnJHVSkoI8O3C/90q9Y1z5T5bIfdjskV1F04s9QcnCJi7FFoMWwd8XfYPWHSDuFIGWBh53fuZOp4WnOyw0+cIaxWsTXTEH4Mbo/XGYFyEoOqGuqnUH48WUx28Hud24mH/rgdnkeE2KBTNSJRR2aUHj1VlWisAuO9/aalgidAgCa+vVVW2FfbM9DvYS2jT34fIxaZGIfsoXiyp+q4tbBHNsaseUiPYqEkwFFNBt+PMdBbq8edoOXBqSr+WqwRLmKZn65xWX7El39PqiO5zFGi1KRyq+jxGIahWwbGSWgUV8fHuK6oPVuiqAT/SkB5w2oV54xkkHw/mzi4UM3c+M9pYWfdDdbRlR9jX5unWu94K4iSdaNJfTyqrWcSOkap6cM9oM8zKihvCLU7tQJhyXj9C3i+Stc2TxudXsJrl2qXZ1gDVPtMckRHfwlo2rCwWD6RXmlkjbgkePyKr86qNkFU44GXVuHTSfJi2sRItbOav5nXToKBoUS4iMNWhb3CM5Tz85AULTsG9xKarg41wPF5ZNfR9nqAMjAX3dD8HewUEORkO1PlOR249JHVYRFbJI9BrGOZdXRAH1PtkndEiDxABk12EUOY4HNxgLRD/0s2gru1Cw9f+qjMGo59U8Xq0Vw73vxmsa0qiKpwkj6+wSay/+PxSHeAtm8H9N4gmhjWZszNVQXWawdsTx7eNRO650Vu9zivdeDexheIddHZuGq4+HSs8fMcuBtc+LYOmP/jJshImdvja252WLoq767OUELD0ILqnyLv8r8fpIwWXJTb5xFmXCxwkJsR+WLzaPif8wOwIRazJLV5+nQS00DRxwIfVlmaci2FEZtqFTvMKpWXTbxhKijzWuCcUu3iMfHSuUoEO+ygqb3jeflsMTKxj2zGzOS5KgtCddFyXjNtc3EDZtucmD+cRfqGtQ6LNLy0rdm c7vqEB3G bTrVxy/UhgUvKh196opip1qE1W1yczf4dEKofLhOpvF6sj3umcmGlrbu7jn4v9i9XS1WpOWoi5+zbfWV0y3gUkRiso55VzjKVxgk1s5/mkCKOk37Y50j4AgPXQYnyize9JOD1uxnHXsCMFwWk9XcwhOru4gda187MfYYCNieE/Wi8moMgeq4K50vD+osw6eX2xRjwgcVkP0QDB+i7jSU8jlz64zD/jMnJflafKq1yK29wMoJjUE653jBC4w7dhoiLwB6POilaJV/VszJoO3BLM5iu8lVu+bnGghtdTwiU50Agx/qLHGsJIr3nXn7n1xMVWpYPWlVaa2zLZB/s1GqLj/0l55I2gMIR4hDxEpogVELaotOjFPlkBIrAXEmYODAKfyz1 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: List-Subscribe: List-Unsubscribe: On Tue, 23 Jul 2024 12:35:23 -0400 Zi Yan wrote: > > > 64 bool folio_has_cpupid(struct folio *folio) > > 65 { > > 66 return !(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) || > > 67 node_is_toptier(folio_nid(folio)); > > 68 } > > 69 > > The error has been reported by Lorenzo Stoakes at: https://lore.kernel.org/linux-mm/6effd690-3cf2-46bc-8061-2d19922ad4fa@lucifer.local/. > I will fix it in the next version. a) "in the next version" is too casual, sorry. We broke the build! Panic! I'll apply this: --- a/mm/memory-tiers.c~memory-tiering-introduce-folio_has_cpupid-check-fix +++ a/mm/memory-tiers.c @@ -51,6 +51,7 @@ static const struct bus_type memory_tier .dev_name = "memory_tier", }; +#ifdef CONFIG_NUMA_BALANCING /** * folio_has_cpupid - check if a folio has cpupid information * @folio: folio to check @@ -66,6 +67,7 @@ bool folio_has_cpupid(struct folio *foli return !(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) || node_is_toptier(folio_nid(folio)); } +#endif #ifdef CONFIG_MIGRATION static int top_tier_adistance; _ b) is a next version planned so soon? If so, why was this version sent? Please try to avoid sending an entire new patchset for a few trivial fixups. Just send the fixups!