1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
index 7b45959ebd92..e251533a5939 100644
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -113,7 +113,8 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void);
 * array is a part of the structure and the fifo type where the array is
 * outside of the fifo structure.
 */
-#define __is_kfifo_ptr(fifo)    (sizeof(*fifo) == sizeof(struct __kfifo))
+#define __is_kfifo_ptr(fifo) \
+        (sizeof(*fifo) == sizeof(STRUCT_KFIFO_PTR(typeof(*(fifo)->type))))
 /**
 * DECLARE_KFIFO_PTR - macro to declare a fifo pointer object

diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 7b45959ebd92..e251533a5939 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h
@@ -113,7 +113,8 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void);
113	* array is a part of the structure and the fifo type where the array is	113	* array is a part of the structure and the fifo type where the array is
114	* outside of the fifo structure.	114	* outside of the fifo structure.
115	*/	115	*/
116	#define __is_kfifo_ptr(fifo) (sizeof(*fifo) == sizeof(struct __kfifo))	116	#define __is_kfifo_ptr(fifo) \
		117	(sizeof(fifo) == sizeof(STRUCT_KFIFO_PTR(typeof((fifo)->type))))
117		118
118	/**	119	/**
119	* DECLARE_KFIFO_PTR - macro to declare a fifo pointer object	120	* DECLARE_KFIFO_PTR - macro to declare a fifo pointer object