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 131622D94A0 for ; Sun, 1 Mar 2026 01:44:32 +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=1772329472; cv=none; b=o8JtS1J9xtFze+jc2bc6Rmtu0Ef10cBjhHnTiQ8rmPHCTKrrfpK98aVN/nxlg7QH3qiVGagYoCS651niG7kxNWgcYscxESTEtDtwTcoyTpUa1t++d5Vx/4F6eX+R1w0eAxdt6B6qG0eHtw1wKumx77FccctKE1hf39gdsUln+r0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772329472; c=relaxed/simple; bh=OKmzZFzyCAf20fXK+5ls4iExh4RiW5P4WUKUTWuBAk4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=kRdNL31oW+K8eOJifHwPd360Gr8qdJovph1DmyvMTVUOr4ATiGdanmbMQSgoVwhrDn6O+Twpa6gag7xo554WbNa8gI3p5i9Xi65M1H5iVI8eZFBUI53TRWEZTLdxMzEkpou/nXUhYHrlRNuat6O3dXJMQEvr1t81T+YtkccMvNI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IKUT8L/F; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IKUT8L/F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F140C19421; Sun, 1 Mar 2026 01:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772329471; bh=OKmzZFzyCAf20fXK+5ls4iExh4RiW5P4WUKUTWuBAk4=; h=From:To:Cc:Subject:Date:From; b=IKUT8L/FfJ1o4aCg8zKFZhuaGGjKeC0PhEUSLBDo76kAR7yA1jnE1CovIXvFqebij u0ocq5boeIMTtVuzJd+7erG1sALkaJQ0tDBRD0rWs7AfORh8omSB8hpAH3tAVnsfDK XzrVY39XtLlLd4bNyo2OP1uuh5PG/jU44eqgYXAo+QryOe+KfNlUYBJpemnRYRdORC r/CWOR03vq3SqbIQvcA6B41bwyf8aiS5bnDXuk0u5utBLXPY8C743pUilDgoaUY33f 88dsktIO5mY7BvLS/iYAexIFe6BDQyMtdDQXL9yYYdaaEvjeTYiqODM7lHlmRl1QRs HM5cF7AeltuUA== From: Sasha Levin To: stable@vger.kernel.org, williamt@cadence.com Cc: Max Filippov , Chris Zankel , Andrew Morton , linux-mm@kvack.org Subject: FAILED: Patch "mm/highmem: fix __kmap_to_page() build error" failed to apply to 6.1-stable tree Date: Sat, 28 Feb 2026 20:44:29 -0500 Message-ID: <20260301014430.1706774-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 94350fe6cad77b46c3dcb8c96543bef7647efbc0 Mon Sep 17 00:00:00 2001 From: William Tambe Date: Thu, 11 Dec 2025 12:38:19 -0800 Subject: [PATCH] mm/highmem: fix __kmap_to_page() build error This changes fixes following build error which is a miss from ef6e06b2ef87 ("highmem: fix kmap_to_page() for kmap_local_page() addresses"). mm/highmem.c:184:66: error: 'pteval' undeclared (first use in this function); did you mean 'pte_val'? 184 | idx = arch_kmap_local_map_idx(i, pte_pfn(pteval)); In __kmap_to_page(), pteval is used but does not exist in the function. (akpm: affects xtensa only) Link: https://lkml.kernel.org/r/SJ0PR07MB86317E00EC0C59DA60935FDCD18DA@SJ0PR07MB8631.namprd07.prod.outlook.com Fixes: ef6e06b2ef87 ("highmem: fix kmap_to_page() for kmap_local_page() addresses") Signed-off-by: William Tambe Reviewed-by: Max Filippov Cc: Chris Zankel Cc: Max Filippov Cc: Signed-off-by: Andrew Morton --- mm/highmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/highmem.c b/mm/highmem.c index b5c8e4c2d5d49..a33e411839517 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -180,12 +180,13 @@ struct page *__kmap_to_page(void *vaddr) for (i = 0; i < kctrl->idx; i++) { unsigned long base_addr; int idx; + pte_t pteval = kctrl->pteval[i]; idx = arch_kmap_local_map_idx(i, pte_pfn(pteval)); base_addr = __fix_to_virt(FIX_KMAP_BEGIN + idx); if (base_addr == base) - return pte_page(kctrl->pteval[i]); + return pte_page(pteval); } } -- 2.51.0