From: David Härdeman Date: Tue, 23 Mar 2010 20:35:22 +0000 (-0700) Subject: kfifo: fix KFIFO_INIT in include/linux/kfifo.h X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4c87684d32e8f95715d53039dcd2d998dc63d1eb;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git kfifo: fix KFIFO_INIT in include/linux/kfifo.h include/linux/kfifo.h first defines and then undefines __kfifo_initializer which is used by INIT_KFIFO (which is also a macro, so building a module which uses INIT_KFIFO will fail). Signed-off-by: David Härdeman Acked-by: Stefani Seibold Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index bc0fc795bd35..ece0b1c33816 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h @@ -102,8 +102,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,