Skip to contentSkip to conversation

kernel.h: Move oops_in_progress to printk.h

PATCH In review Andy Shevchenko 3 participants 6 messages Sep 11, 2020 – Sep 15, 2020 Printk

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 include/linux/debug_locks.h | 2 +-
 include/linux/kernel.h      | 1 -
 include/linux/printk.h      | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)
include/linux/debug_locks.h +1 -1
index e7e45f0cc7da..2915f56ad421 100644
@@ -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;
 
include/linux/kernel.h +0 -1
index 6a4e875f198e..dc249ed1a3d5 100644
@@ -526,7 +526,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;
include/linux/printk.h +2 -0
index 34c1a7be3e01..f749a2c2e7a5 100644
@@ -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)
Signature · 1 line
2.28.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Andy Shevchenko

The oops_in_progress is defined in printk.c, so it's logical to move oops_in_progress to printk.h.

Yeah, it makes sense.

I am always a bit afraid of messing with these heavily used includes. Let's see if boots complain about some build failure.

Best Regards,
Petr

#2 lore raw
Quoted 4 lines · Petr Mladek
Quoted 3 lines · Andy Shevchenko

The oops_in_progress is defined in printk.c, so it's logical to move oops_in_progress to printk.h.

Quoted 8 lines
Quoted 1 line

Yeah, it makes sense.

I am always a bit afraid of messing with these heavily used includes. Let's see if boots complain about some build failure.

Agree.

Just to clarify: I assumed, might be wrongly, that this will go via PRINTK tree. If you have something else in mind, please tell, I will route it to the corresponding maintainer(s).

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#3 lore raw
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Petr Mladek
Quoted 4 lines · Andy Shevchenko

The oops_in_progress is defined in printk.c, so it's logical to move oops_in_progress to printk.h.

Yeah, it makes sense.

Quoted 8 lines
Quoted 2 lines

I am always a bit afraid of messing with these heavily used includes. Let's see if boots complain about some build failure.

Agree.

Just to clarify: I assumed, might be wrongly, that this will go via PRINTK tree. If you have something else in mind, please tell, I will route it to the corresponding maintainer(s).

I have just pushed the patch into printk/linux.git, branch for-5.10.

I am sorry that I was not clear enough. I wanted to wait at least one day just in case anyone (human or robot) complains.

Best Regards,
Petr

#4 lore raw
Quoted 17 lines · Petr Mladek
Quoted 16 lines · Andy Shevchenko
Quoted 4 lines · Petr Mladek
Quoted 3 lines · Andy Shevchenko

The oops_in_progress is defined in printk.c, so it's logical to move oops_in_progress to printk.h.

Quoted 8 lines
Quoted 1 line

Yeah, it makes sense.

I am always a bit afraid of messing with these heavily used includes. Let's see if boots complain about some build failure.

Agree.

Quoted 8 lines
Quoted 3 lines

Just to clarify: I assumed, might be wrongly, that this will go via PRINTK tree. If you have something else in mind, please tell, I will route it to the corresponding maintainer(s).

I have just pushed the patch into printk/linux.git, branch for-5.10.

I am sorry that I was not clear enough. I wanted to wait at least one day just in case anyone (human or robot) complains.

Thank you, Petr, for clarification and applying it!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
Acked-by on v1 1/1
#5 lore raw
In reply to Andy Shevchenko

On (20/09/11 20:02), Andy Shevchenko wrote:
[..]

Quoted 10 lines

extern void bust_spinlocks(int yes);

include/linux/kernel.h +0 -1
-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;
include/linux/printk.h +0 -0
index 34c1a7be3e01..f749a2c2e7a5 100644

include/linux/printk.h line 15

Quoted 4 lines
include/linux/printk.h +1 -0
@@ -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 */

This can also become __read_mostly, I guess.

FWIW,

	-ss