]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
kprobes: Cleanup the config comment
authorJinjie Ruan <ruanjinjie@huawei.com>
Tue, 13 Aug 2024 11:53:33 +0000 (19:53 +0800)
committerMasami Hiramatsu (Google) <mhiramat@kernel.org>
Thu, 31 Oct 2024 01:59:42 +0000 (10:59 +0900)
The CONFIG_KPROBES_ON_FTRACE #if/#else/#endif section is small and doesn't
nest additional #ifdefs so the comment is useless and should be removed,
but the __ARCH_WANT_KPROBES_INSN_SLOT and CONFIG_OPTPROBES() nest is long,
it is better to add comment for reading.

Link: https://lore.kernel.org/all/20240813115334.3922580-3-ruanjinjie@huawei.com/
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
kernel/kprobes.c

index da59c68df8412c4662d39d3e286d516e8cee9a69..5f4117b1ff70937d2aa199652a3670498cf04a42 100644 (file)
@@ -353,8 +353,8 @@ struct kprobe_insn_cache kprobe_optinsn_slots = {
        /* .insn_size is initialized later */
        .nr_garbage = 0,
 };
-#endif
-#endif
+#endif /* CONFIG_OPTPROBES */
+#endif /* __ARCH_WANT_KPROBES_INSN_SLOT */
 
 /* We have preemption disabled.. so it is safe to use __ versions */
 static inline void set_kprobe_instance(struct kprobe *kp)
@@ -1543,7 +1543,7 @@ static int check_ftrace_location(struct kprobe *p)
        if (ftrace_location(addr) == addr) {
 #ifdef CONFIG_KPROBES_ON_FTRACE
                p->flags |= KPROBE_FLAG_FTRACE;
-#else  /* !CONFIG_KPROBES_ON_FTRACE */
+#else
                return -EINVAL;
 #endif
        }