diff options
| author | David Härdeman <david@hardeman.nu> | 2010-03-23 13:35:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 16:01:46 -0700 |
| commit | 5e2c1b11b55ed5d758d503ba0a9d6188c7f7aad1 (patch) | |
| tree | 5cb6309a64283813f5387c82675eb4188617702d /include/linux | |
| parent | b48cf4837f3edb4b0fa8101f4544dba37be6188f (diff) | |
| download | kernel-crypto-5e2c1b11b55ed5d758d503ba0a9d6188c7f7aad1.tar.gz kernel-crypto-5e2c1b11b55ed5d758d503ba0a9d6188c7f7aad1.tar.xz kernel-crypto-5e2c1b11b55ed5d758d503ba0a9d6188c7f7aad1.zip | |
kfifo: fix KFIFO_INIT in include/linux/kfifo.h
commit 4c87684d32e8f95715d53039dcd2d998dc63d1eb upstream.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kfifo.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index bc0fc795bd3..ece0b1c3381 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, |