Merge tag 'for-6.0/dm-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[tomoyo/tomoyo-test1.git] / mm / highmem.c

diff --git a/mm/highmem.c b/mm/highmem.c
index 1a69299..c707d72 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -150,7 +150,7 @@ struct page *__kmap_to_page(void *vaddr)
                return pte_page(pkmap_page_table[i]);
        }
 
-       return virt_to_page(addr);
+       return virt_to_page(vaddr);
 }
 EXPORT_SYMBOL(__kmap_to_page);
 
@@ -561,7 +561,7 @@ void *__kmap_local_page_prot(struct page *page, pgprot_t prot)
 }
 EXPORT_SYMBOL(__kmap_local_page_prot);
 
-void kunmap_local_indexed(void *vaddr)
+void kunmap_local_indexed(const void *vaddr)
 {
        unsigned long addr = (unsigned long) vaddr & PAGE_MASK;
        pte_t *kmap_pte;