kasan: rename kasan_zero_page to kasan_early_shadow_page

[platform/kernel/linux-rpi.git] / arch / xtensa / mm / kasan_init.c

diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c
index 6b95ca4..1734cda 100644 (file)
--- a/arch/xtensa/mm/kasan_init.c
+++ b/arch/xtensa/mm/kasan_init.c
@@ -24,12 +24,13 @@ void __init kasan_early_init(void)
        int i;
 
        for (i = 0; i < PTRS_PER_PTE; ++i)
-               set_pte(kasan_zero_pte + i,
-                       mk_pte(virt_to_page(kasan_zero_page), PAGE_KERNEL));
+               set_pte(kasan_early_shadow_pte + i,
+                       mk_pte(virt_to_page(kasan_early_shadow_page),
+                               PAGE_KERNEL));
 
        for (vaddr = 0; vaddr < KASAN_SHADOW_SIZE; vaddr += PMD_SIZE, ++pmd) {
                BUG_ON(!pmd_none(*pmd));
-               set_pmd(pmd, __pmd((unsigned long)kasan_zero_pte));
+               set_pmd(pmd, __pmd((unsigned long)kasan_early_shadow_pte));
        }
        early_trap_init();
 }
@@ -80,13 +81,16 @@ void __init kasan_init(void)
        populate(kasan_mem_to_shadow((void *)VMALLOC_START),
                 kasan_mem_to_shadow((void *)XCHAL_KSEG_BYPASS_VADDR));
 
-       /* Write protect kasan_zero_page and zero-initialize it again. */
+       /*
+        * Write protect kasan_early_shadow_page and zero-initialize it again.
+        */
        for (i = 0; i < PTRS_PER_PTE; ++i)
-               set_pte(kasan_zero_pte + i,
-                       mk_pte(virt_to_page(kasan_zero_page), PAGE_KERNEL_RO));
+               set_pte(kasan_early_shadow_pte + i,
+                       mk_pte(virt_to_page(kasan_early_shadow_page),
+                               PAGE_KERNEL_RO));
 
        local_flush_tlb_all();
-       memset(kasan_zero_page, 0, PAGE_SIZE);
+       memset(kasan_early_shadow_page, 0, PAGE_SIZE);
 
        /* At this point kasan is fully initialized. Enable error messages. */
        current->kasan_depth = 0;