]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mm/highmem: fix __kmap_to_page() build error
authorWilliam Tambe <williamt@cadence.com>
Thu, 11 Dec 2025 20:38:19 +0000 (12:38 -0800)
committerAndrew Morton <akpm@linux-foundation.org>
Sat, 31 Jan 2026 22:22:38 +0000 (14:22 -0800)
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 <williamt@cadence.com>
Reviewed-by: Max Filippov <jcmvbkbc@gmail.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/highmem.c

index b5c8e4c2d5d49e9cb46d598022b68b133432d29f..a33e41183951758bb217932ccd3d06589403ec01 100644 (file)
@@ -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);
                }
        }