From 9b17b9bbc52980a4ba97e5a26efdd9be311fad8c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 26 Oct 2010 14:21:19 -0700
Subject: [PATCH] --- yaml --- r: 217432 b: refs/heads/master c:
 52c5171214ff3327961d0ce0db7e8d2ce55004fd h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/kfifo.h | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8f5a02eabcc5..c102ecc2ae81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b627d5771312c92404b66f0a0b16f66036dd2e1
+refs/heads/master: 52c5171214ff3327961d0ce0db7e8d2ce55004fd
diff --git a/trunk/include/linux/kfifo.h b/trunk/include/linux/kfifo.h
index 62dbee554f60..c238ad2f82ea 100644
--- a/trunk/include/linux/kfifo.h
+++ b/trunk/include/linux/kfifo.h
@@ -171,11 +171,8 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void);
 	}
 
 
-static inline unsigned int __must_check
-__kfifo_must_check_helper(unsigned int val)
-{
-	return val;
-}
+/* __kfifo_must_check_helper() is temporarily disabled because it was faulty */
+#define __kfifo_must_check_helper(x) (x)
 
 /**
  * kfifo_initialized - Check if the fifo is initialized