[patch RFC 13/29] printk: Move buffer size defines

From: Thomas Gleixner
Date: Sat Sep 10 2022 - 18:28:57 EST


Move the buffer size defines to console.h in preperation of adding a buffer
structure.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
include/linux/console.h | 14 ++++++++++++++
include/linux/printk.h | 2 --
kernel/printk/printk.c | 8 --------
3 files changed, 14 insertions(+), 10 deletions(-)

--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -122,6 +122,20 @@ static inline int con_debug_leave(void)
#define CM_ERASE (2)
#define CM_MOVE (3)

+#ifdef CONFIG_PRINTK
+/* The maximum size of a formatted record (i.e. with prefix added per line) */
+#define CONSOLE_LOG_MAX 1024
+
+/* The maximum size for a dropped text message */
+#define DROPPED_TEXT_MAX 64
+#else
+#define CONSOLE_LOG_MAX 0
+#define DROPPED_TEXT_MAX 0
+#endif
+
+/* The maximum size of an formatted extended record */
+#define CONSOLE_EXT_LOG_MAX 8192
+
/*
* The interface for a console, or any other device that wants to capture
* console messages (printer driver?)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -44,8 +44,6 @@ static inline const char *printk_skip_he
return buffer;
}

-#define CONSOLE_EXT_LOG_MAX 8192
-
/* printk's without a loglevel use this.. */
#define MESSAGE_LOGLEVEL_DEFAULT CONFIG_MESSAGE_LOGLEVEL_DEFAULT

--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -428,12 +428,6 @@ static struct latched_seq clear_seq = {
#define PREFIX_MAX 32
#endif

-/* the maximum size of a formatted record (i.e. with prefix added per line) */
-#define CONSOLE_LOG_MAX 1024
-
-/* the maximum size for a dropped text message */
-#define DROPPED_TEXT_MAX 64
-
/* the maximum size allowed to be reserved for a record */
#define LOG_LINE_MAX (CONSOLE_LOG_MAX - PREFIX_MAX)

@@ -2338,8 +2332,6 @@ static bool __pr_flush(struct console *c

#else /* CONFIG_PRINTK */

-#define CONSOLE_LOG_MAX 0
-#define DROPPED_TEXT_MAX 0
#define printk_time false

#define prb_read_valid(rb, seq, r) false