Skip to content

Commit 36d818f

Browse files
andy-shevpmladek
authored andcommitted
kernel.h: Move oops_in_progress to printk.h
The oops_in_progress is defined in printk.c, so it's logical to move oops_in_progress to printk.h. Signed-off-by: Andy Shevchenko <[email protected]> Acked-by: Sergey Senozhatsky <[email protected]> Signed-off-by: Petr Mladek <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 730037c commit 36d818f

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

include/linux/debug_locks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#ifndef __LINUX_DEBUG_LOCKING_H
33
#define __LINUX_DEBUG_LOCKING_H
44

5-
#include <linux/kernel.h>
65
#include <linux/atomic.h>
76
#include <linux/bug.h>
7+
#include <linux/printk.h>
88

99
struct task_struct;
1010

include/linux/kernel.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,6 @@ extern unsigned int sysctl_oops_all_cpu_backtrace;
527527
#endif /* CONFIG_SMP */
528528

529529
extern void bust_spinlocks(int yes);
530-
extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */
531530
extern int panic_timeout;
532531
extern unsigned long panic_print;
533532
extern int panic_on_oops;

include/linux/printk.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
extern const char linux_banner[];
1313
extern const char linux_proc_banner[];
1414

15+
extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */
16+
1517
#define PRINTK_MAX_SINGLE_HEADER_LEN 2
1618

1719
static inline int printk_get_level(const char *buffer)

0 commit comments

Comments
 (0)