---
Changes in v6:
- Call kasan_init_generic() in arch/riscv _after_ local_flush_tlb_all()
---
  arch/arm/mm/kasan_init.c    | 2 +-
  arch/arm64/mm/kasan_init.c  | 4 +---
  arch/riscv/mm/kasan_init.c  | 1 +
  arch/s390/kernel/early.c    | 3 ++-
  arch/x86/mm/kasan_init_64.c | 2 +-
  arch/xtensa/mm/kasan_init.c | 2 +-
  6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mm/kasan_init.c b/arch/arm/mm/kasan_init.c
index 111d4f703136..c6625e808bf8 100644
--- a/arch/arm/mm/kasan_init.c
+++ b/arch/arm/mm/kasan_init.c

@@ -300,6 +300,6 @@ void __init kasan_init(void)
  	local_flush_tlb_all();
  
  	memset(kasan_early_shadow_page, 0, PAGE_SIZE);
-	pr_info("Kernel address sanitizer initialized\n");
  	init_task.kasan_depth = 0;
+	kasan_init_generic();
  }

diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c
index d541ce45daeb..abeb81bf6ebd 100644
--- a/arch/arm64/mm/kasan_init.c
+++ b/arch/arm64/mm/kasan_init.c

@@ -399,14 +399,12 @@ void __init kasan_init(void)
  {
  	kasan_init_shadow();
  	kasan_init_depth();
-#if defined(CONFIG_KASAN_GENERIC)
+	kasan_init_generic();
  	/*
  	 * Generic KASAN is now fully initialized.
  	 * Software and Hardware Tag-Based modes still require
  	 * kasan_init_sw_tags() and kasan_init_hw_tags() correspondingly.
  	 */
-	pr_info("KernelAddressSanitizer initialized (generic)\n");
-#endif
  }
  
  #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */

diff --git a/arch/riscv/mm/kasan_init.c b/arch/riscv/mm/kasan_init.c
index 41c635d6aca4..c4a2a9e5586e 100644
--- a/arch/riscv/mm/kasan_init.c
+++ b/arch/riscv/mm/kasan_init.c

@@ -533,4 +533,5 @@ void __init kasan_init(void)
  
  	csr_write(CSR_SATP, PFN_DOWN(__pa(swapper_pg_dir)) | satp_mode);
  	local_flush_tlb_all();
+	kasan_init_generic();
  }

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 9adfbdd377dc..544e5403dd91 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c

@@ -21,6 +21,7 @@
  #include <linux/kernel.h>
  #include <asm/asm-extable.h>
  #include <linux/memblock.h>
+#include <linux/kasan.h>
  #include <asm/access-regs.h>
  #include <asm/asm-offsets.h>
  #include <asm/machine.h>

@@ -65,7 +66,7 @@ static void __init kasan_early_init(void)
  {
  #ifdef CONFIG_KASAN
  	init_task.kasan_depth = 0;
-	pr_info("KernelAddressSanitizer initialized\n");
+	kasan_init_generic();
  #endif
  }
  

diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
index 0539efd0d216..998b6010d6d3 100644
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c

@@ -451,5 +451,5 @@ void __init kasan_init(void)
  	__flush_tlb_all();
  
  	init_task.kasan_depth = 0;
-	pr_info("KernelAddressSanitizer initialized\n");
+	kasan_init_generic();
  }

diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c
index f39c4d83173a..0524b9ed5e63 100644
--- a/arch/xtensa/mm/kasan_init.c
+++ b/arch/xtensa/mm/kasan_init.c

@@ -94,5 +94,5 @@ void __init kasan_init(void)
  
  	/* At this point kasan is fully initialized. Enable error messages. */
  	current->kasan_depth = 0;
-	pr_info("KernelAddressSanitizer initialized\n");
+	kasan_init_generic();
  }