Merge branch 'dev' of https://github.com/ShirkNeko/SukiSU-Ultra into dev

kernel/Makefile

@@ -18,6 +18,12 @@ obj-$(CONFIG_KSU) += kernelsu.o
 
 obj-$(CONFIG_KPM) += kpm/
 
+ifeq ($(CONFIG_KPM),y)
+$(info -- KPM is enabled)
+else
+$(info -- KPM is disabled)
+endif
+
 
 # .git is a text file while the module is imported by 'git submodule add'.
 ifeq ($(shell test -e $(srctree)/$(src)/../.git; echo $$?),0)
@@ -47,7 +53,7 @@ endif
 
 $(info -- KernelSU Manager signature size: $(KSU_EXPECTED_SIZE))
 $(info -- KernelSU Manager signature hash: $(KSU_EXPECTED_HASH))
-$(info -- Supported Unofficial Manager: ShirkNeko (GKI) (Non-GKI))
+$(info -- Supported Unofficial Manager: 5ec1cff (GKI) ShirkNeko udochina (GKI and KPM))
 KERNEL_VERSION := $(VERSION).$(PATCHLEVEL)
 $(info -- KERNEL_VERSION: $(KERNEL_VERSION))
 

kernel/core_hook.c

@@ -687,6 +687,7 @@ __maybe_unused int ksu_kprobe_init(void)
 	pr_info("renameat kp: %d\n", rc);
 
 	#ifdef CONFIG_KPM
+	// KPM初始化状态
 	kpm_cfi_bypass_init();
 	// kpm_stack_init();
 	#endif
@@ -699,6 +700,7 @@ __maybe_unused int ksu_kprobe_exit(void)
 	unregister_kprobe(&prctl_kp);
 	unregister_kprobe(&renameat_kp);
 	#ifdef CONFIG_KPM
+	// KPM取消状态
 	kpm_cfi_bypass_exit();
 	// kpm_stack_exit();
 	#endif