luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

printk_ratelimited(): fix uninitialized spinlock

Browse Source 
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>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
OGAWA Hirofumi 2010-05-24 14:33:11 -07:00 committed by Linus Torvalds
parent fa1f68db6c
commit d8521fcc5e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/kernel.h
View File

@ -424,14 +424,13 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
* no local ratelimit_state used in the !PRINTK case * no local ratelimit_state used in the !PRINTK case
*/ */
#ifdef CONFIG_PRINTK #ifdef CONFIG_PRINTK
#define printk_ratelimited(fmt, ...) ({ \ #define printk_ratelimited(fmt, ...) ({ \
static struct ratelimit_state _rs = { \ static DEFINE_RATELIMIT_STATE(_rs, \
.interval = DEFAULT_RATELIMIT_INTERVAL, \ DEFAULT_RATELIMIT_INTERVAL, \
.burst = DEFAULT_RATELIMIT_BURST, \ DEFAULT_RATELIMIT_BURST); \
}; \ \
\ if (__ratelimit(&_rs)) \
if (__ratelimit(&_rs)) \ printk(fmt, ##__VA_ARGS__); \
printk(fmt, ##__VA_ARGS__); \
}) })
#else #else
/* No effect, but we still get type checking even in the !PRINTK case: */ /* No effect, but we still get type checking even in the !PRINTK case: */