Merge branch 'for-next/pgtable'

* for-next/pgtable:
  arm64: mm: create new fine-grained mappings at boot
  arm64: ensure _stext and _etext are page-aligned
  arm64: mm: allow passing a pgdir to alloc_init_*
  arm64: mm: allocate pagetables anywhere
  arm64: mm: use fixmap when creating page tables
  arm64: mm: add functions to walk tables in fixmap
  arm64: mm: add __{pud,pgd}_populate
  arm64: mm: avoid redundant __pa(__va(x))
  arm64: mm: add functions to walk page tables by PA
  arm64: mm: move pte_* macros
  arm64: kasan: avoid TLB conflicts
  arm64: mm: add code to safely replace TTBR1_EL1
  arm64: add function to install the idmap
  arm64: unmap idmap earlier
  arm64: unify idmap removal
  arm64: mm: place empty_zero_page in bss
  arm64: mm: specialise pagetable allocators
  asm-generic: make __set_fixmap_offset a static inline

diff --cc arch/arm64/include/asm/pgtable.h
Simple merge

diff --cc arch/arm64/kernel/head.S
Simple merge

diff --cc arch/arm64/kernel/smp.c
Simple merge

diff --cc arch/arm64/mm/kasan_init.c
index cab7a5be40aa85cbd933635d48208d2af54bcf1c,0ca411fc5ea37da8e7c1e037039282f770ad2a69..cc569a38bc76fa40fa02fdded8438772a0cc1e0a
--- 1/arch/arm64/mm/kasan_init.c
--- 2/arch/arm64/mm/kasan_init.c
+++ b/arch/arm64/mm/kasan_init.c
@@@ -156,17 -162,8 +163,16 @@@ void __init kasan_init(void
                                pfn_to_nid(virt_to_pfn(start)));
        }
  
 +      /*
 +       * KAsan may reuse the contents of kasan_zero_pte directly, so we
 +       * should make sure that it maps the zero page read-only.
 +       */
 +      for (i = 0; i < PTRS_PER_PTE; i++)
 +              set_pte(&kasan_zero_pte[i],
 +                      pfn_pte(virt_to_pfn(kasan_zero_page), PAGE_KERNEL_RO));
 +
        memset(kasan_zero_page, 0, PAGE_SIZE);
-       cpu_set_ttbr1(__pa(swapper_pg_dir));
-       flush_tlb_all();
+       cpu_replace_ttbr1(swapper_pg_dir);
  
        /* At this point kasan is fully initialized. Enable error messages */
        init_task.kasan_depth = 0;

diff --cc arch/arm64/mm/proc.S
Simple merge