kprobes: Use CONFIG_PREEMPTION
authorThomas Gleixner <tglx@linutronix.de>
Fri, 26 Jul 2019 21:19:41 +0000 (23:19 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 31 Jul 2019 17:03:35 +0000 (19:03 +0200)
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by
CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same
functionality which today depends on CONFIG_PREEMPT.

Switch kprobes conditional over to CONFIG_PREEMPTION.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Paul E. McKenney <paulmck@linux.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20190726212124.516286187@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/kprobes.c

index 9873fc6..8bc5f1f 100644 (file)
@@ -1906,7 +1906,7 @@ int register_kretprobe(struct kretprobe *rp)
 
        /* Pre-allocate memory for max kretprobe instances */
        if (rp->maxactive <= 0) {
-#ifdef CONFIG_PREEMPT
+#ifdef CONFIG_PREEMPTION
                rp->maxactive = max_t(unsigned int, 10, 2*num_possible_cpus());
 #else
                rp->maxactive = num_possible_cpus();