From 313fa2dc9d7b5a8198d3bb773e13cecc0df15028 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 21 Dec 2009 13:02:24 +0100
Subject: [PATCH] --- yaml --- r: 178680 b: refs/heads/master c:
 c2ef6661ce62e26a8c0978e521fab646128a144b h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/kprobes.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e66f606f2846..d4c510759189 100644
--- 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
index e5342a344c43..b7df302a0204 100644
--- 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