diff options
| author | Alexander Gordeev <agordeev@linux.ibm.com> | 2022-12-10 00:09:44 +0300 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2023-01-13 16:15:04 +0300 |
| commit | 8772555ad0e43c31cb5e29f33b23c7c11ecd5a9d (patch) | |
| tree | 3e7a54d1313749702af046e2253bddcf89cb6b1a /arch/s390/mm | |
| parent | aae2f753d2a96fb062c3cb710ccbd4cb3d5b9452 (diff) | |
| download | linux-8772555ad0e43c31cb5e29f33b23c7c11ecd5a9d.tar.xz | |
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>
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/kasan_init.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/s390/mm/kasan_init.c b/arch/s390/mm/kasan_init.c index c9674f83ed0c..6fbc1dc63d3a 100644 --- 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) |