forked from Minki/linux
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@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
5b17aecfcd
commit
06b031de22
@ -1661,7 +1661,7 @@ asmlinkage int vprintk_emit(int facility, int level,
|
|||||||
const char *dict, size_t dictlen,
|
const char *dict, size_t dictlen,
|
||||||
const char *fmt, va_list args)
|
const char *fmt, va_list args)
|
||||||
{
|
{
|
||||||
static int recursion_bug;
|
static bool recursion_bug;
|
||||||
static char textbuf[LOG_LINE_MAX];
|
static char textbuf[LOG_LINE_MAX];
|
||||||
char *text = textbuf;
|
char *text = textbuf;
|
||||||
size_t text_len = 0;
|
size_t text_len = 0;
|
||||||
@ -1697,7 +1697,7 @@ asmlinkage int vprintk_emit(int facility, int level,
|
|||||||
* it can be printed at the next appropriate moment:
|
* it can be printed at the next appropriate moment:
|
||||||
*/
|
*/
|
||||||
if (!oops_in_progress && !lockdep_recursing(current)) {
|
if (!oops_in_progress && !lockdep_recursing(current)) {
|
||||||
recursion_bug = 1;
|
recursion_bug = true;
|
||||||
local_irq_restore(flags);
|
local_irq_restore(flags);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1712,7 +1712,7 @@ asmlinkage int vprintk_emit(int facility, int level,
|
|||||||
static const char recursion_msg[] =
|
static const char recursion_msg[] =
|
||||||
"BUG: recent printk recursion!";
|
"BUG: recent printk recursion!";
|
||||||
|
|
||||||
recursion_bug = 0;
|
recursion_bug = false;
|
||||||
/* emit KERN_CRIT message */
|
/* emit KERN_CRIT message */
|
||||||
printed_len += log_store(0, 2, LOG_PREFIX|LOG_NEWLINE, 0,
|
printed_len += log_store(0, 2, LOG_PREFIX|LOG_NEWLINE, 0,
|
||||||
NULL, 0, recursion_msg,
|
NULL, 0, recursion_msg,
|
||||||
|
Loading…
Reference in New Issue
Block a user