From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE2F82798E6; Tue, 27 May 2025 17:10:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365845; cv=none; b=jwNVLHOXVScURP2c6cf+2u8qUeLiWUXDpT44XrfSfAyavw9Vb0Bg8vOOiN6ALNg4KWlP2CQi3bbT6owZKvchWFfQ5LbruqnvNc1rwSxmqLDkcCt6/7+9+NZFcnUKdQcoBq3a5mYO0F6H5tLX/jxuKTLCCSuOoAA2LqmaNuyeK1A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365845; c=relaxed/simple; bh=zEi7m6vyj7NXZiUhy78/UjuVbqEGSLBJPiAbGqe87F4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J0WDb37UdM9zFXGsm4estLqdVjYwcb9J1xHMvzczwIEJPqZsy6df6FaMgfbvhxLTrAjo+fRKbHknpuc1OH8c6DpOowJL+dqkBbswEHmXS2S/2RPb/n9+7HBy+BKOfyVpRlpIPV0Pj9HkUo4jlEsoAzbb6w95xr4hwyisQlBESAU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vh3bezUt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Vh3bezUt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6630CC4CEE9; Tue, 27 May 2025 17:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365844; bh=zEi7m6vyj7NXZiUhy78/UjuVbqEGSLBJPiAbGqe87F4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vh3bezUt65XwswUR3m9kVb9roXRGqf1D/gzDXF0WWSQvhOVegO7HFjrqhQxNv0TnM QMdFkKv/9Hu4Xbp/1Qak6RPn1bZYVEdVpPcFJfuOhEVvgL3vcbfE+pAKQtvxP/ysYk M8oMWHudoX8nh3R34Yl4G7sclt+g7+UMEQkoA8Lw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Ritesh Harjani (IBM)" , Donet Tom , Madhavan Srinivasan , Sasha Levin Subject: [PATCH 6.12 506/626] book3s64/radix: Fix compile errors when CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=n Date: Tue, 27 May 2025 18:26:39 +0200 Message-ID: <20250527162505.526359317@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ritesh Harjani (IBM) [ Upstream commit 29bdc1f1c1df80868fb35bc69d1f073183adc6de ] Fix compile errors when CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=n Signed-off-by: Ritesh Harjani (IBM) Signed-off-by: Donet Tom Signed-off-by: Madhavan Srinivasan Link: https://patch.msgid.link/8231763344223c193e3452eab0ae8ea966aff466.1741609795.git.donettom@linux.ibm.com Signed-off-by: Sasha Levin --- arch/powerpc/mm/book3s64/radix_pgtable.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 04189689c127e..0d807bf2328d8 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -988,7 +988,7 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start, return 0; } - +#ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap) { if (radix_enabled()) @@ -996,6 +996,7 @@ bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap) return false; } +#endif int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node, unsigned long addr, unsigned long next) -- 2.39.5