Merge branch 'master' into for-next

1 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
index 7eb6ec41f486..9fad0527344f 100644
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -86,7 +86,8 @@ union { \
  */
 #define INIT_KFIFO(name) \
         name = __kfifo_initializer(sizeof(name##kfifo_buffer) - \
-                                sizeof(struct kfifo), name##kfifo_buffer)
+                                sizeof(struct kfifo), \
+                                name##kfifo_buffer + sizeof(struct kfifo))
 
 /**
  * DEFINE_KFIFO - macro to define and initialize a kfifo
@@ -102,8 +103,6 @@ union { \
         unsigned char name##kfifo_buffer[size]; \
         struct kfifo name = __kfifo_initializer(size, name##kfifo_buffer)
 
-#undef __kfifo_initializer
-
 extern void kfifo_init(struct kfifo *fifo, void *buffer,
                         unsigned int size);
 extern __must_check int kfifo_alloc(struct kfifo *fifo, unsigned int size,