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 <andriy.shevchenko@linux.intel.com>
Acked-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20200911170202.8565-1-andriy.shevchenko@linux.intel.com

diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index e7e45f0cc7da511b04889e68824600e831a7fbb8..2915f56ad4214f1586df36665feb16f3b97336ca 100644 (file)
--- 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 82d91547d122d50ef1f0afedb566b80aca2b3863..6cef4ca5589c8823c5a3f6d3b37f418225a46183 100644 (file)
--- 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 34c1a7be3e014ffa75dff86237942dc73bcb16ed..f749a2c2e7a5c75a5b6816c7d1cb07e6a249a372 100644 (file)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -12,6 +12,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)