diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-09-11 20:02:02 +0300 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-09-15 14:51:08 +0300 |
| commit | 36d818f610f218e9e8711bf498b62a27778dae3f (patch) | |
| tree | c8d63f2870e24f90f21a1cb32242388d0fa2c174 | |
| parent | 730037c3ee57f892e6df019bc88d417a5944737c (diff) | |
| download | linux-36d818f610f218e9e8711bf498b62a27778dae3f.tar.xz | |
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
| -rw-r--r-- | include/linux/debug_locks.h | 2 | ||||
| -rw-r--r-- | include/linux/kernel.h | 1 | ||||
| -rw-r--r-- | 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 e7e45f0cc7da..2915f56ad421 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 82d91547d122..6cef4ca5589c 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 34c1a7be3e01..f749a2c2e7a5 100644 --- 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) |