diff --git a/[refs] b/[refs] index c7ea11b0e965..961c8a6549e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0498b63504f818e5ab39c818cd6f7b41319a1187 +refs/heads/master: a0d50069ed3620e9a4d8939bbc3e0d5a692ab58a diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c index f24cbab558f1..34a885bb82e0 100644 --- a/trunk/kernel/kprobes.c +++ b/trunk/kernel/kprobes.c @@ -431,7 +431,7 @@ static int __kprobes register_aggr_kprobe(struct kprobe *old_p, copy_kprobe(old_p, p); ret = add_new_kprobe(old_p, p); } else { - ap = kcalloc(1, sizeof(struct kprobe), GFP_KERNEL); + ap = kzalloc(sizeof(struct kprobe), GFP_KERNEL); if (!ap) return -ENOMEM; add_aggr_kprobe(ap, old_p);