The patch titled
printk_ratelimited(): fix uninitialized spinlock
has been added to the -mm tree. Its filename is
printk_ratelimited-fix-uninitialized-spinlock.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: printk_ratelimited(): fix uninitialized spinlock
From: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/kernel.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff -puN include/linux/kernel.h~printk_ratelimited-fix-uninitialized-spinlock include/linux/kernel.h
--- a/include/linux/kernel.h~printk_ratelimited-fix-uninitialized-spinlock
+++ a/include/linux/kernel.h
@@ -423,14 +423,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: */
_
Patches currently in -mm which might be from hirofumi@xxxxxxxxxxxxxxxxxx are
origin.patch
linux-next.patch
printk_ratelimited-fix-uninitialized-spinlock.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
