diff --git a/[refs] b/[refs]
index 05d0affdb420..dffedf11f01d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33f724eb9e3d6e33aad410318d3ac720fecbdbcd
+refs/heads/master: 7e105057a34c83cea542dacc55ff0528bce67afa
diff --git a/trunk/include/linux/kfifo.h b/trunk/include/linux/kfifo.h
index 7c6b32a1421c..c4ac88b3c302 100644
--- a/trunk/include/linux/kfifo.h
+++ b/trunk/include/linux/kfifo.h
@@ -228,13 +228,6 @@ static inline __must_check unsigned int kfifo_out_locked(struct kfifo *fifo,
 
 	ret = kfifo_out(fifo, to, n);
 
-	/*
-	 * optimization: if the FIFO is empty, set the indices to 0
-	 * so we don't wrap the next time
-	 */
-	if (kfifo_is_empty(fifo))
-		kfifo_reset(fifo);
-
 	spin_unlock_irqrestore(lock, flags);
 
 	return ret;