s390/kasan: cleanup setup of zero pgtable

Fix variables initialization coding style and setup zero
pgtable same way region and segment pgtables are set up.

Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/mm/kasan_init.c b/arch/s390/mm/kasan_init.c
index c9674f83ed0cb7f2c6f64c47ccc296704e930795..6fbc1dc63d3adc6c7398ff478c4febc767d66af2 100644 (file)
--- a/arch/s390/mm/kasan_init.c
+++ b/arch/s390/mm/kasan_init.c
@@ -251,19 +251,17 @@ static void __init kasan_early_detect_facilities(void)
 
 void __init kasan_early_init(void)
 {
-       unsigned long shadow_alloc_size;
-       unsigned long initrd_end;
-       unsigned long memsize;
-       unsigned long pgt_prot = pgprot_val(PAGE_KERNEL_RO);
-       pte_t pte_z;
+       pte_t pte_z = __pte(__pa(kasan_early_shadow_page) | pgprot_val(PAGE_KERNEL_RO));
        pmd_t pmd_z = __pmd(__pa(kasan_early_shadow_pte) | _SEGMENT_ENTRY);
        pud_t pud_z = __pud(__pa(kasan_early_shadow_pmd) | _REGION3_ENTRY);
        p4d_t p4d_z = __p4d(__pa(kasan_early_shadow_pud) | _REGION2_ENTRY);
+       unsigned long shadow_alloc_size;
+       unsigned long initrd_end;
+       unsigned long memsize;
 
        kasan_early_detect_facilities();
        if (!has_nx)
-               pgt_prot &= ~_PAGE_NOEXEC;
-       pte_z = __pte(__pa(kasan_early_shadow_page) | pgt_prot);
+               pte_z = clear_pte_bit(pte_z, __pgprot(_PAGE_NOEXEC));
 
        memsize = get_mem_detect_end();
        if (!memsize)