Messages in this thread Patch in this message | | | Date | Mon, 28 Dec 2009 10:08:18 GMT | From | tip-bot for Heiko Carstens <> | Subject | [tip:perf/urgent] kprobes: Fix distinct type warning |
| |
Commit-ID: c2ef6661ce62e26a8c0978e521fab646128a144b Gitweb: http://git.kernel.org/tip/c2ef6661ce62e26a8c0978e521fab646128a144b Author: Heiko Carstens <heiko.carstens@de.ibm.com> AuthorDate: Mon, 21 Dec 2009 13:02:24 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Mon, 28 Dec 2009 10:25:31 +0100
kprobes: Fix distinct type warning
Every time I see this:
kernel/kprobes.c: In function 'register_kretprobe': kernel/kprobes.c:1038: warning: comparison of distinct pointer types lacks a cast
I'm wondering if something changed in common code and we need to do something for s390. Apparently that's not the case. Let's get rid of this annoying warning.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Masami Hiramatsu <mhiramat@redhat.com> LKML-Reference: <20091221120224.GA4471@osiris.boeblingen.de.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- kernel/kprobes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index e5342a3..b7df302 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1035,7 +1035,7 @@ int __kprobes register_kretprobe(struct kretprobe *rp) /* Pre-allocate memory for max kretprobe instances */ if (rp->maxactive <= 0) { #ifdef CONFIG_PREEMPT - rp->maxactive = max(10, 2 * num_possible_cpus()); + rp->maxactive = max_t(unsigned int, 10, 2*num_possible_cpus()); #else rp->maxactive = num_possible_cpus(); #endif
| |