From: Hui Tang <tanghui20@huawei.com>
To: <naoya.horiguchi@nec.com>
Cc: <linmiaohe@huawei.com>, <akpm@linux-foundation.org>,
<linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<tanghui20@huawei.com>
Subject: [PATCH] mm/hwpoison: fix build error without CONFIG_MEMORY_FAILURE
Date: Tue, 27 Sep 2022 18:29:46 +0800 [thread overview]
Message-ID: <20220927102946.98622-1-tanghui20@huawei.com> (raw)
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 <tanghui20@huawei.com>
---
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
next reply other threads:[~2022-09-27 10:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 10:29 Hui Tang [this message]
2022-09-27 12:16 ` Bagas Sanjaya
2022-09-28 2:55 ` Hui Tang
2022-09-27 12:53 ` Naoya Horiguchi
2022-09-28 2:54 ` Hui Tang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220927102946.98622-1-tanghui20@huawei.com \
--to=tanghui20@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=naoya.horiguchi@nec.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox