[PATCH v4 3/7] kernel.h: Move oops_in_progress to printk.h

From: Andy Shevchenko
Date: Wed Apr 22 2020 - 08:52:28 EST


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 <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
v4: new patch
include/linux/debug_locks.h | 2 +-
include/linux/kernel.h | 1 -
include/linux/printk.h | 2 ++
3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 257ab3c92cb8a..e5ffbc25475a0 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -2,9 +2,9 @@
#ifndef __LINUX_DEBUG_LOCKING_H
#define __LINUX_DEBUG_LOCKING_H

-#include <linux/kernel.h>
#include <linux/atomic.h>
#include <linux/bug.h>
+#include <linux/printk.h>

struct task_struct;

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 04a5885cec1b4..899302e2b7554 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -527,7 +527,6 @@ extern unsigned int sysctl_oops_all_cpu_backtrace;
#endif /* CONFIG_SMP */

extern void bust_spinlocks(int yes);
-extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */
extern int panic_timeout;
extern unsigned long panic_print;
extern int panic_on_oops;
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 768ac6bc637df..c59fdf688d36c 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -11,6 +11,8 @@
extern const char linux_banner[];
extern const char linux_proc_banner[];

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

static inline int printk_get_level(const char *buffer)
--
2.26.1