Merge branch 'core/softlockup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[safe/jmp/linux-2.6] / kernel / tracepoint.c

diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index adf2873..1ef5d3a 100644 (file)
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -278,10 +278,8 @@ tracepoint_update_probe_range(struct tracepoint *begin, struct tracepoint *end)
        struct tracepoint *iter;
        struct tracepoint_entry *mark_entry;
 
-       if (!begin) {
-               WARN_ON_ONCE(1);
+       if (!begin)
                return;
-       }
 
        mutex_lock(&tracepoints_mutex);
        for (iter = begin; iter < end; iter++) {