]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
kfifo: fix KFIFO_INIT in include/linux/kfifo.h
authorDavid Härdeman <david@hardeman.nu>
Tue, 23 Mar 2010 20:35:22 +0000 (13:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Mar 2010 23:31:20 +0000 (16:31 -0700)
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 <david@hardeman.nu>
Acked-by: Stefani Seibold <stefani@seibold.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/kfifo.h

index bc0fc795bd3536c90feb50b0ce4226c6461447e5..ece0b1c33816d414e79b7d6046d17230fe71bf28 100644 (file)
@@ -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,