diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h
index 602e944dfc9e47f1c2766c0f4549db1f5e6166ea..c9f3c1c1263897e82b353227b81194326c2b4053 100644
--- a/include/linux/livepatch.h
+++ b/include/linux/livepatch.h
@@ -256,6 +256,8 @@ int klp_compare_address(unsigned long pc, unsigned long func_addr,
 	return 0;
 }
 
+void arch_klp_init(void);
+
 #endif
 
 int klp_apply_section_relocs(struct module *pmod, Elf_Shdr *sechdrs,
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index a682a8638e01ec52967b982c5df181ab87e017f0..ae116aac9b48153d0542a8c034a64f3843a92fd1 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -1403,6 +1403,10 @@ long __weak arch_klp_save_old_code(struct arch_klp_data *arch_data, void *old_fu
 	return -ENOSYS;
 }
 
+void __weak arch_klp_init(void)
+{
+}
+
 int __weak arch_klp_check_breakpoint(struct arch_klp_data *arch_data, void *old_func)
 {
 	return 0;
@@ -2293,6 +2297,9 @@ static int __init klp_init(void)
 	if (!klp_root_kobj)
 		goto error_remove;
 
+#ifdef CONFIG_LIVEPATCH_STOP_MACHINE_CONSISTENCY
+	arch_klp_init();
+#endif
 	return 0;
 
 error_remove: