X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=kernel%2Fkprobes.c;h=b7df302a02046e2b9404d8267a66a6300ffd831a;hb=e2b6d02cca533715d6be40fdfc32d3cc47333358;hp=e5342a344c43bee9140d9127f1fe907b21149e8d;hpb=9764757932ce26f139332f89d1d3b815e4cc56ab;p=cascardo%2Flinux.git

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