summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 11:52:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 11:52:24 -0800
commit9d6e323c687c7b94c703c9b0900a74e5d262d462 (patch)
tree82b6dfff0fa732cfabde42001482aad144bb3945 /kernel
parentb21c07040304b8716e38a4a0e4ab60f386357e61 (diff)
parent4efb5290ae187514bd31af8c2d7755e175245e19 (diff)
downloadlinux-9d6e323c687c7b94c703c9b0900a74e5d262d462.tar.gz
linux-9d6e323c687c7b94c703c9b0900a74e5d262d462.tar.bz2
linux-9d6e323c687c7b94c703c9b0900a74e5d262d462.zip
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf kmem: Fix statistics typo kprobes: Fix distinct type warning perf: Rename perf_event_hw_event in design document perf tools: Add missing header files to LIB_H Makefile variable perf record: We should fork only if a program was specified to run perf diff: Fix usage array, it must end with a NULL entry
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kprobes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index e5342a344c43..b7df302a0204 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