The patch titled
Subject: printk: change recursion_bug type to bool
has been added to the -mm tree. Its filename is
printk-change-recursion_bug-type-to-bool.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/printk-change-recursion_bug-type-to-bool.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/printk-change-recursion_bug-type-to-bool.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 ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Subject: printk: change recursion_bug type to bool
`recursion_bug' is used as recursion_bug toggle, so make it `bool'.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/printk/printk.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN kernel/printk/printk.c~printk-change-recursion_bug-type-to-bool kernel/printk/printk.c
--- a/kernel/printk/printk.c~printk-change-recursion_bug-type-to-bool
+++ a/kernel/printk/printk.c
@@ -1662,7 +1662,7 @@ asmlinkage int vprintk_emit(int facility
const char *dict, size_t dictlen,
const char *fmt, va_list args)
{
- static int recursion_bug;
+ static bool recursion_bug;
static char textbuf[LOG_LINE_MAX];
char *text = textbuf;
size_t text_len = 0;
@@ -1699,7 +1699,7 @@ asmlinkage int vprintk_emit(int facility
* it can be printed at the next appropriate moment:
*/
if (!oops_in_progress && !lockdep_recursing(current)) {
- recursion_bug = 1;
+ recursion_bug = true;
local_irq_restore(flags);
return 0;
}
@@ -1714,7 +1714,7 @@ asmlinkage int vprintk_emit(int facility
static const char recursion_msg[] =
"BUG: recent printk recursion!";
- recursion_bug = 0;
+ recursion_bug = false;
/* emit KERN_CRIT message */
printed_len += log_store(0, 2, LOG_PREFIX|LOG_NEWLINE, 0,
NULL, 0, recursion_msg,
_
Patches currently in -mm which might be from sergey.senozhatsky@xxxxxxxxx are
zram-zcomp-use-gfp_noio-to-allocate-streams.patch
zram-zcomp-do-not-zero-out-zcomp-private-pages.patch
printk-change-recursion_bug-type-to-bool.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
