Skip to content

Commit f0f6923

Browse files
committed
Merge branch 'rework/misc-cleanups' into for-linus
2 parents b355362 + 132a90d commit f0f6923

File tree

5 files changed

+156
-73
lines changed

5 files changed

+156
-73
lines changed

include/linux/console.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ static inline int con_debug_leave(void)
154154
* receiving the printk spam for obvious reasons.
155155
* @CON_EXTENDED: The console supports the extended output format of
156156
* /dev/kmesg which requires a larger output buffer.
157+
* @CON_SUSPENDED: Indicates if a console is suspended. If true, the
158+
* printing callbacks must not be called.
157159
*/
158160
enum cons_flags {
159161
CON_PRINTBUFFER = BIT(0),
@@ -163,6 +165,7 @@ enum cons_flags {
163165
CON_ANYTIME = BIT(4),
164166
CON_BRL = BIT(5),
165167
CON_EXTENDED = BIT(6),
168+
CON_SUSPENDED = BIT(7),
166169
};
167170

168171
/**

kernel/debug/kdb/kdb_io.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,8 @@ static void kdb_msg_write(const char *msg, int msg_len)
576576
continue;
577577
if (c == dbg_io_ops->cons)
578578
continue;
579+
if (!c->write)
580+
continue;
579581
/*
580582
* Set oops_in_progress to encourage the console drivers to
581583
* disregard their internal spin locks: in the current calling

kernel/printk/internal.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,5 @@ struct printk_message {
103103
u64 seq;
104104
unsigned long dropped;
105105
};
106+
107+
bool other_cpu_in_panic(void);

0 commit comments

Comments
 (0)