From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13759344DBD for ; Thu, 3 Sep 2026 05:36:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788413774; cv=none; b=GLhu2yPoNOBxkJ4hyuC6H/Y4Gkrzj5yR/ykGVRp9p9gTVHehUklHIGbXTBGbnOK7hbEKKFicaeKyoIzxJd5R4uTkzC2GeECkDdaNDfP4+K27g9lPL0ZyN8rbRPpHKLDY27qQrbmJ3ibMWLXE5i2UzMaSWFMywfHKmuL5WE4/6fM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788413774; c=relaxed/simple; bh=XsehUQBu1zymeRNt1s6Ov24fTjL0E26lmzfvGaBn2R0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JNJDYp/eSPfiMXd55F+HQ2c9rtPO76+Gi1euW3e3PLkXPC3VXYjQ8EzMaPW+YqEdihm5VuigJ+Ayrbs7cnGJ8KtqDzTNbH+goZxGyDFC2l4obWZF2VEiUbuCcjtjdi6dmTPaYsvpPX63MuPwl+Z0l1OPCkv3b7pDRbf+0whBqvw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=I0HKlWnz; arc=none smtp.client-ip=95.215.58.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="I0HKlWnz" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=XsehUQBu1zymeRNt1s6Ov24fTjL0E26lmzfvGaBn2R0=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1788413770; v=1; x=1789018570; b=I0HKlWnzNX441OhTwD8TwdHY8Hzs5uinU2xuBh2aBiefDqtxQjjTcoixnKyinf4VC6IutfzC Z2g/Id1k7kIz2/jlsGbKn6MjEmOgj0N69U1BcgyCZ01gaqd1iiyJiPpp9TJZmHp0jQKgcRvFumu 0qbZKUcTEYKi8UEU47tZ1oQU= X-Envelope-To: linux-kernel@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 78007f4d4477b093; Thu, 03 Sep 2026 05:36:10 +0000 X-Mizu-Trace-ID: 78007f4d4477b093 X-Migadu-Flow: FLOW_OUT From: Kaitao Cheng To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Dan Williams , Vishal Verma , Dave Jiang , Alison Schofield , Ira Weiny Cc: Muchun Song , linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org, Kaitao Cheng Subject: [PATCH 2/2] nvdimm/pmem: Remove test_and_clear_pmem_poison() Date: Thu, 3 Sep 2026 13:35:35 +0800 Message-ID: <20260903053535.17611-3-kaitao.cheng@linux.dev> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260903053535.17611-1-kaitao.cheng@linux.dev> References: <20260903053535.17611-1-kaitao.cheng@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kaitao Cheng TestClearPageHWPoison() is now defined regardless of whether CONFIG_MEMORY_FAILURE is enabled, returning false when memory failure handling is unavailable. The test_and_clear_pmem_poison() wrapper duplicates this configuration handling and has no other pmem-specific behavior. Call TestClearPageHWPoison() directly and remove the redundant wrapper. This also removes the need to include page-flags.h from pmem.h. No functional change is intended. Signed-off-by: Kaitao Cheng --- drivers/nvdimm/pmem.c | 2 +- drivers/nvdimm/pmem.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 30a51c365ce8..5fb86595e8bd 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -80,7 +80,7 @@ static void pmem_mkpage_present(struct pmem_device *pmem, phys_addr_t offset, * here since we're in the driver I/O path and * outstanding I/O requests pin the dev_pagemap. */ - if (test_and_clear_pmem_poison(page)) + if (TestClearPageHWPoison(page)) clear_mce_nospec(pfn); } } diff --git a/drivers/nvdimm/pmem.h b/drivers/nvdimm/pmem.h index a48509f90196..76870505dd79 100644 --- a/drivers/nvdimm/pmem.h +++ b/drivers/nvdimm/pmem.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef __NVDIMM_PMEM_H__ #define __NVDIMM_PMEM_H__ -#include #include #include #include @@ -31,15 +30,4 @@ long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, long nr_pages, enum dax_access_mode mode, void **kaddr, unsigned long *pfn); -#ifdef CONFIG_MEMORY_FAILURE -static inline bool test_and_clear_pmem_poison(struct page *page) -{ - return TestClearPageHWPoison(page); -} -#else -static inline bool test_and_clear_pmem_poison(struct page *page) -{ - return false; -} -#endif #endif /* __NVDIMM_PMEM_H__ */ -- 2.50.1 (Apple Git-155)