[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <87hbm7e6x9.fsf@devron.myhome.or.jp>
Date: Mon, 17 May 2010 08:57:38 +0900
From: OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] Fix uninitialized spinlock of printk_ratelimited()
ratelimit_state initialization of printk_ratelimited() seems
broken. This fixes it by using DEFINE_RATELIMIT_STATE() to initialize
spinlock properly.
Signed-off-by: OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>
---
include/linux/kernel.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff -puN include/linux/kernel.h~printk_ratelimited-fix include/linux/kernel.h
--- linux-2.6/include/linux/kernel.h~printk_ratelimited-fix 2010-05-17 03:37:33.000000000 +0900
+++ linux-2.6-hirofumi/include/linux/kernel.h 2010-05-17 03:37:33.000000000 +0900
@@ -420,14 +420,13 @@ static inline char *pack_hex_byte(char *
* no local ratelimit_state used in the !PRINTK case
*/
#ifdef CONFIG_PRINTK
-#define printk_ratelimited(fmt, ...) ({ \
- static struct ratelimit_state _rs = { \
- .interval = DEFAULT_RATELIMIT_INTERVAL, \
- .burst = DEFAULT_RATELIMIT_BURST, \
- }; \
- \
- if (__ratelimit(&_rs)) \
- printk(fmt, ##__VA_ARGS__); \
+#define printk_ratelimited(fmt, ...) ({ \
+ static DEFINE_RATELIMIT_STATE(_rs, \
+ DEFAULT_RATELIMIT_INTERVAL, \
+ DEFAULT_RATELIMIT_BURST); \
+ \
+ if (__ratelimit(&_rs)) \
+ printk(fmt, ##__VA_ARGS__); \
})
#else
/* No effect, but we still get type checking even in the !PRINTK case: */
_
--
OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>
--
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