[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100330224815.206858923@linux.site>
Date: Tue, 30 Mar 2010 15:41:58 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
David HÀrdeman <david@...deman.nu>,
Stefani Seibold <stefani@...bold.net>,
Greg Kroah-Hartman <gregkh@...e.de>
Subject: [084/156] kfifo: fix KFIFO_INIT in include/linux/kfifo.h
2.6.33-stable review patch. If anyone has any objections, please let us know.
------------------
From: =?UTF-8?q?David=20H=C3=A4rdeman?= <david@...deman.nu>
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@...deman.nu>
Acked-by: Stefani Seibold <stefani@...bold.net>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
include/linux/kfifo.h | 2 --
1 file changed, 2 deletions(-)
--- 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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists