Commit dfc05b55 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

kprobes: Use IS_ENABLED() instead of kprobes_built_in() 

Use IS_ENABLED(CONFIG_KPROBES) instead of kprobes_built_in().
This inline function is introduced only for avoiding #ifdef.
But since now we have IS_ENABLED(), it is no longer needed.

Link: https://lkml.kernel.org/r/163163038581.489837.2805250706507372658.stgit@devnote2



Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 223a76b2

include/linux/kprobes.h

+1 −13
Original line number Diff line number Diff line
@@ -180,14 +180,6 @@ struct kprobe_blacklist_entry { 
DECLARE_PER_CPU(struct kprobe *, current_kprobe);

DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);



/*

 * For #ifdef avoidance:

 */

static inline int kprobes_built_in(void)

{

	return 1;

}



extern void kprobe_busy_begin(void);

extern void kprobe_busy_end(void);
@@ -417,10 +409,6 @@ int arch_kprobe_get_kallsym(unsigned int *symnum, unsigned long *value, 
			    char *type, char *sym);

#else /* !CONFIG_KPROBES: */



static inline int kprobes_built_in(void)

{

	return 0;

}

static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)

{

	return 0;
@@ -514,7 +502,7 @@ static inline bool is_kprobe_optinsn_slot(unsigned long addr) 
static nokprobe_inline bool kprobe_page_fault(struct pt_regs *regs,

					      unsigned int trap)

{

	if (!kprobes_built_in())

	if (!IS_ENABLED(CONFIG_KPROBES))

		return false;

	if (user_mode(regs))

		return false;