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 53D29C6FA83 for ; Tue, 27 Sep 2022 10:34:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 98C6C8E00C0; Tue, 27 Sep 2022 06:34:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9141F8E00AF; Tue, 27 Sep 2022 06:34:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B4698E00C0; Tue, 27 Sep 2022 06:34:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6785D8E00AF for ; Tue, 27 Sep 2022 06:34:13 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 20AC680ECF for ; Tue, 27 Sep 2022 10:34:13 +0000 (UTC) X-FDA: 79957505586.24.97C3AC5 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf18.hostedemail.com (Postfix) with ESMTP id A92F31C0016 for ; Tue, 27 Sep 2022 10:34:10 +0000 (UTC) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4McGBs39yRzHqMZ; Tue, 27 Sep 2022 18:31:49 +0800 (CST) Received: from kwepemm600005.china.huawei.com (7.193.23.191) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 18:34:05 +0800 Received: from ubuntu1804.huawei.com (10.67.175.30) by kwepemm600005.china.huawei.com (7.193.23.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 18:34:04 +0800 From: Hui Tang To: CC: , , , , Subject: [PATCH] mm/hwpoison: fix build error without CONFIG_MEMORY_FAILURE Date: Tue, 27 Sep 2022 18:29:46 +0800 Message-ID: <20220927102946.98622-1-tanghui20@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.175.30] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664274852; 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:in-reply-to: references; bh=p20OR+6/iIoYzZCNDyYXhWWTGqXazXK2HVN3vpF05jw=; b=K+6Mmzo9t/+lneNeh4ATeM59aavxDPzR8nDLjNkpo7aVrBV4GQS7FlLm4JvIE5rBcqNZiz usXnVHH7AChjUr5SK5uXt3/H4vMwKTbA9WXZ7EGwhHFvlDsY11+dgVWHZ9pd3AcDzGfA8f hMdwT6PzzA6MyF9OUIGO6OD1gNUV6hI= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of tanghui20@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=tanghui20@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664274852; a=rsa-sha256; cv=none; b=GpckXsnGmOUj+8tI176nEg+D+dJBtsJV9JCbyX0nVGW490NqKpoTuaeJkw7u56Wx/8ZjFT 54X8XYJ1M/9/CxKdQsuI9B6/OmQOUnP6T6b79ZfpQzWiRNSIHkzXKf/regapwS801D4ovv vHXbubDkktu7COGo6wphEI0rX16WN7E= X-Rspam-User: Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of tanghui20@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=tanghui20@huawei.com X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A92F31C0016 X-Stat-Signature: hcp9p9w1nmg8gmpdu5ychpf571c6oqpc X-HE-Tag: 1664274850-360741 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: Building without CONFIG_MEMORY_FAILURE will fail: mm/memory-failure.o: In function `action_result': memory-failure.c: undefined reference to `memblk_nr_poison_inc' mm/memory-failure.o: In function `page_handle_poison': memory-failure.c: undefined reference to `memblk_nr_poison_inc' mm/memory-failure.o: In function `__get_huge_page_for_hwpoison': memory-failure.c: undefined reference to `memblk_nr_poison_inc' mm/memory-failure.o: In function `unpoison_memory': memory-failure.c: undefined reference to `memblk_nr_poison_sub' mm/memory-failure.o: In function `num_poisoned_pages_inc': memory-failure.c: undefined reference to `memblk_nr_poison_inc' Add CONFIG_MEMORY_FAILURE wrapper for invoking memblk_nr_poison_{inc|sub}. Fixes: 69b496f03bb4 ("mm/hwpoison: introduce per-memory_block hwpoison counter") Signed-off-by: Hui Tang --- mm/memory-failure.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 03479895086d..5bb9d2d20234 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -77,14 +77,18 @@ static bool hw_memory_failure __read_mostly = false; void num_poisoned_pages_inc(unsigned long pfn) { atomic_long_inc(&num_poisoned_pages); +#ifdef CONFIG_MEMORY_FAILURE memblk_nr_poison_inc(pfn); +#endif } static inline void num_poisoned_pages_sub(unsigned long pfn, long i) { atomic_long_sub(i, &num_poisoned_pages); +#ifdef CONFIG_MEMORY_FAILURE if (pfn != -1UL) memblk_nr_poison_sub(pfn, i); +#endif } /* -- 2.17.1