1 files changed, 6 insertions, 4 deletions

diff --git a/kernel/relay.c b/kernel/relay.c
index 9d79b7854fa6..e92db8c06acf 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -750,7 +750,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;
@@ -797,13 +797,15 @@ void relay_subbufs_consumed(struct rchan *chan,
         if (!chan)
                 return;
 
-        if (cpu >= NR_CPUS || !chan->buf[cpu])
+        if (cpu >= NR_CPUS || !chan->buf[cpu] ||
+                                        subbufs_consumed > chan->n_subbufs)
                 return;
 
         buf = chan->buf[cpu];
-        buf->subbufs_consumed += subbufs_consumed;
-        if (buf->subbufs_consumed > buf->subbufs_produced)
+        if (subbufs_consumed > buf->subbufs_produced - buf->subbufs_consumed)
                 buf->subbufs_consumed = buf->subbufs_produced;
+        else
+                buf->subbufs_consumed += subbufs_consumed;
 }
 EXPORT_SYMBOL_GPL(relay_subbufs_consumed);