Merge branch 'tracing/core-v2' into tracing-for-linus

[linux-2.6-omap-h63xx.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index edc0ba6d81607e225ff8083397dc04eeeffdd871..824b91ac10f1f94f3990d5db6f7437d161f0f2a4 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -748,7 +748,7 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
                         * from the scheduler (trying to re-grab
                         * rq->lock), so defer it.
                         */
-                       __mod_timer(&buf->timer, jiffies + 1);
+                       mod_timer(&buf->timer, jiffies + 1);
        }
 
        old = buf->data;