Messages in this thread Patch in this message | | | From | OGAWA Hirofumi <> | Subject | [PATCH] Fix uninitialized spinlock of printk_ratelimited() | Date | Mon, 17 May 2010 08:57:38 +0900 |
| |
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@mail.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@mail.parknet.co.jp>
| |