Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/kfifo.c b/lib/kfifo.c
index d79b9d222065..90ba1eb1df06 100644
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@ -561,8 +561,7 @@ EXPORT_SYMBOL(__kfifo_to_user_r);
 unsigned int __kfifo_dma_in_prepare_r(struct __kfifo *fifo,
         struct scatterlist *sgl, int nents, unsigned int len, size_t recsize)
 {
-        if (!nents)
-                BUG();
+        BUG_ON(!nents);
 
         len = __kfifo_max_r(len, recsize);
 
@@ -585,8 +584,7 @@ EXPORT_SYMBOL(__kfifo_dma_in_finish_r);
 unsigned int __kfifo_dma_out_prepare_r(struct __kfifo *fifo,
         struct scatterlist *sgl, int nents, unsigned int len, size_t recsize)
 {
-        if (!nents)
-                BUG();
+        BUG_ON(!nents);
 
         len = __kfifo_max_r(len, recsize);