diff --git a/[refs] b/[refs] index 9e35ea89a936..7c9bb970535a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a7b46b369419493bab4de67b1526e9f76b22a7f +refs/heads/master: 7522a8423bed9931cbac5502b9c0657bde2700ea diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c index 1156eb0977d0..1fbf466a29aa 100644 --- a/trunk/kernel/kprobes.c +++ b/trunk/kernel/kprobes.c @@ -585,6 +585,9 @@ int __kprobes register_kretprobe(struct kretprobe *rp) int i; rp->kp.pre_handler = pre_handler_kretprobe; + rp->kp.post_handler = NULL; + rp->kp.fault_handler = NULL; + rp->kp.break_handler = NULL; /* Pre-allocate memory for max kretprobe instances */ if (rp->maxactive <= 0) {