From nobody Mon Apr 6 04:44:18 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1358AECAAD3 for ; Sat, 10 Sep 2022 22:28:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230447AbiIJW24 (ORCPT ); Sat, 10 Sep 2022 18:28:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230153AbiIJW2B (ORCPT ); Sat, 10 Sep 2022 18:28:01 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 305E74362D for ; Sat, 10 Sep 2022 15:27:55 -0700 (PDT) Message-ID: <20220910222301.141696132@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1662848872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=ucJCwIArz/Obdz0no/ZggjeV/meklOatxzaddZBmlzw=; b=Z+lN6QD2lalfKWyMMeV80c6lroOwf0YpggJVEVXBFRkop3lUHQNNQMPFQWidfh6xAdukWy BwW3sj9r0bPhXA095G3tuR1gKLsJWp8P3F21XmAAAdTJ+84z7C7Sc+sh313TLXDHyZfQL2 ekpwKrHqIN8O5kgmp6Fb9a8NZ1ibwCLD2/yDO5V7WS6EBJi2/ZYko/weq1+ozgKCweXHOT ImX2Bp96HLxU2OvIXEJISkpJu+N2fbt+IfXOPiMEYEKfb0RSJzUvET593kZjh9GGS8vIit JR+rONc0gnJINRl8IvzHikMafhfqSfhtiGlj91Mf5AKce/H6hJ3V6uXxKYpxRw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1662848872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=ucJCwIArz/Obdz0no/ZggjeV/meklOatxzaddZBmlzw=; b=uYSC3ZXu9l3Q0SYJXNB43seqCZIqWAwtL2eEHo4sVg9eKHX9S3rHW6oR9jb7jGloW7A3NE T0hbmxLva2VDv5Dg== From: Thomas Gleixner To: LKML Cc: John Ogness , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , Linus Torvalds , Peter Zijlstra , "Paul E. McKenney" , Daniel Vetter , Greg Kroah-Hartman , Helge Deller , Jason Wessel , Daniel Thompson Subject: [patch RFC 13/29] printk: Move buffer size defines References: <20220910221947.171557773@linutronix.de> MIME-Version: 1.0 Date: Sun, 11 Sep 2022 00:27:52 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the buffer size defines to console.h in preperation of adding a buffer structure. Signed-off-by: Thomas Gleixner --- 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) =20 +#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; } =20 -#define CONSOLE_EXT_LOG_MAX 8192 - /* printk's without a loglevel use this.. */ #define MESSAGE_LOGLEVEL_DEFAULT CONFIG_MESSAGE_LOGLEVEL_DEFAULT =20 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -428,12 +428,6 @@ static struct latched_seq clear_seq =3D { #define PREFIX_MAX 32 #endif =20 -/* 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) =20 @@ -2338,8 +2332,6 @@ static bool __pr_flush(struct console *c =20 #else /* CONFIG_PRINTK */ =20 -#define CONSOLE_LOG_MAX 0 -#define DROPPED_TEXT_MAX 0 #define printk_time false =20 #define prb_read_valid(rb, seq, r) false