Commit-ID: 92616606368ee01f1163fcfc986116c810cd48ba Gitweb: https://git.kernel.org/tip/92616606368ee01f1163fcfc986116c810cd48ba Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Fri, 26 Jul 2019 23:19:41 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 31 Jul 2019 19:03:35 +0200
kprobes: Use CONFIG_PREEMPTION 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 <t...@linutronix.de> Acked-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Masami Hiramatsu <mhira...@kernel.org> Cc: Paolo Bonzini <pbonz...@redhat.com> Cc: Paul E. McKenney <paul...@linux.ibm.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Steven Rostedt <rost...@goodmis.org> Link: http://lkml.kernel.org/r/20190726212124.516286...@linutronix.de Signed-off-by: Ingo Molnar <mi...@kernel.org> --- kernel/kprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 9873fc627d61..8bc5f1ffd68e 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -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();
