From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Joe Perches <joe@perches.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v4 3/7] kernel.h: Move oops_in_progress to printk.h
Date: Wed, 22 Apr 2020 15:51:57 +0300 [thread overview]
Message-ID: <20200422125201.37618-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200422125201.37618-1-andriy.shevchenko@linux.intel.com>
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>
---
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
next prev parent reply other threads:[~2020-04-22 12:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 12:51 [PATCH v4 1/7] drm: shmobile: Reduce include dependencies Andy Shevchenko
2020-04-22 12:51 ` [PATCH v4 2/7] kernel.h: Drop unneeded <linux/kernel.h> inclusion from other headers Andy Shevchenko
2020-04-22 12:51 ` Andy Shevchenko [this message]
2020-04-22 12:51 ` [PATCH v4 4/7] kernel.h: Split out min()/max() et al helpers Andy Shevchenko
2020-04-22 14:52 ` Joe Perches
2020-04-22 15:44 ` Andy Shevchenko
2020-04-22 15:51 ` Joe Perches
2020-04-23 9:33 ` Rasmus Villemoes
2020-04-22 12:51 ` [PATCH v4 5/7] kernel.h: Split out mathematical helpers Andy Shevchenko
2020-04-22 12:52 ` [PATCH v4 6/7] kernel.h: Split out panic and oops helpers Andy Shevchenko
2020-04-24 17:04 ` kbuild test robot
2020-04-24 17:27 ` kbuild test robot
2020-04-22 12:52 ` [PATCH v4 7/7] kernel.h: Split out might_sleep() and friends Andy Shevchenko
2020-04-24 15:49 ` kbuild test robot
2020-04-24 17:45 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200422125201.37618-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox