---

yaml --- r: 178680 b: refs/heads/master c: c2ef666 h: refs/heads/master v: v3
git-mirror · Dec 28, 2009 · 313fa2d · 313fa2d
1 parent 92d0b96
commit 313fa2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b413e44d64aeac36a096505a40fc2ff470872fa
+refs/heads/master: c2ef6661ce62e26a8c0978e521fab646128a144b
diff --git a/trunk/kernel/kprobes.c b/trunk/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