diff --git a/[refs] b/[refs] index 16016dd88696..3c66a7b892b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 490362003457f8d387f6f6e73e3a7efbf56c3314 +refs/heads/master: 09933a108e6730a464a1ab676c9decc11aee0edc diff --git a/trunk/kernel/tracepoint.c b/trunk/kernel/tracepoint.c index 79602740bbb5..adf28734fe2d 100644 --- a/trunk/kernel/tracepoint.c +++ b/trunk/kernel/tracepoint.c @@ -272,12 +272,17 @@ static void disable_tracepoint(struct tracepoint *elem) * * Updates the probe callback corresponding to a range of tracepoints. */ -void tracepoint_update_probe_range(struct tracepoint *begin, - struct tracepoint *end) +void +tracepoint_update_probe_range(struct tracepoint *begin, struct tracepoint *end) { struct tracepoint *iter; struct tracepoint_entry *mark_entry; + if (!begin) { + WARN_ON_ONCE(1); + return; + } + mutex_lock(&tracepoints_mutex); for (iter = begin; iter < end; iter++) { mark_entry = get_tracepoint(iter->name);