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 4197DC433EF for ; Wed, 29 Jun 2022 02:56:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A64008E0001; Tue, 28 Jun 2022 22:56:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A14546B0072; Tue, 28 Jun 2022 22:56:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 902B28E0001; Tue, 28 Jun 2022 22:56:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7EBA96B0071 for ; Tue, 28 Jun 2022 22:56:10 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 40DAE120C7A for ; Wed, 29 Jun 2022 02:56:10 +0000 (UTC) X-FDA: 79629759300.11.2045F7B Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf11.hostedemail.com (Postfix) with ESMTP id C5B6140025 for ; Wed, 29 Jun 2022 02:56:06 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LXmJx5pyqzkX2q; Wed, 29 Jun 2022 10:54:41 +0800 (CST) Received: from [10.174.177.76] (10.174.177.76) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 29 Jun 2022 10:56:01 +0800 Subject: Re: [PATCH -next] mm/memory-failure: fix redefinition of mf_generic_kill_procs To: Zheng Bin , , CC: , , References: <20220628112143.1170473-1-zhengbin13@huawei.com> From: Miaohe Lin Message-ID: <3e3691cc-c29e-78be-eeff-56ecb6753182@huawei.com> Date: Wed, 29 Jun 2022 10:56:00 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20220628112143.1170473-1-zhengbin13@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.76] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656471370; a=rsa-sha256; cv=none; b=NGMSUUB0LUFWMws0+hQcIAwf/JUpZuw/ham3s19Uh3l+/AbfKncQhab0WosCcNBSFjz2+6 /odV92rzIeKsM9aYsKWgR2dmR2OaiXsgM0mjlOJkAFFS/SMZ1SRzWbqtRDH2q/q/TLSrVC dqrVQnlBmXqRcCATM0biJejYeYtzrks= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656471370; 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; bh=SX5eoRv0kCJpfdHjQo3ijGsTDmNA7diDSdoqvLYrfgw=; b=V0neIgLomXFazEB3FaBIpN7JiZTuU8VKRE4H3Byt3kRxOHF5M0pvGN15ZaVcONp2Iyky+n SG/qHu/tqLI9zH6lDW1XfMDWEkuFu/JfiCnzxNhDJXAI32D9ZCddDS4IXHoAYgapY6/aya XHFUvzKoPy3r3KCAizKVfeCmscFH/bk= X-Rspam-User: X-Stat-Signature: 9ywb93a5gu9j7ky7rmq6hj5ohg7uynfn X-Rspamd-Queue-Id: C5B6140025 Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-Rspamd-Server: rspam03 X-HE-Tag: 1656471366-822620 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 2022/6/28 19:21, Zheng Bin wrote: > If CONFIG_HUGETLB_PAGE=n, building fails: > > mm/memory-failure.c:1805:19: error: redefinition of ‘mf_generic_kill_procs’ > static inline int mf_generic_kill_procs(unsigned long long pfn, int flags, > ^~~~~~~~~~~~~~~~~~~~~ > mm/memory-failure.c:1564:12: note: previous definition of ‘mf_generic_kill_procs’ was here > static int mf_generic_kill_procs(unsigned long long pfn, int flags, > > This patch fixes that. > > Fixes: 4184e8d7d056 ("mm-factor-helpers-for-memory_failure_dev_pagemap-fix") > Signed-off-by: Zheng Bin Thanks for fixing this. mf_generic_kill_procs shouldn't depend on CONFIG_HUGETLB_PAGE. Reviewed-by: Miaohe Lin BTW: It seems there is a mess between CONFIG_HUGETLB_PAGE and CONFIG_FS_DAX. It's better to fix it later. > --- > mm/memory-failure.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 001fead45f30..c9931c676335 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -1801,13 +1801,6 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb > } > > #else > - > -static inline int mf_generic_kill_procs(unsigned long long pfn, int flags, > - struct dev_pagemap *pgmap) > -{ > - return 0; > -} > - > static inline int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb) > { > return 0; > -- > 2.31.1 > > . >