On Thu, Jul 03, 2025 at 10:35:13AM +0300, Jani Nikula wrote:
On Mon, 30 Jun 2025, Lucas De Marchi <[email protected]> wrote:
This reverts commit 41e750b906022da3e4fb9dc57bc17670a340ad23.
It's not used in CI anymore, probably for a very long time. So we don't
need maintain this in topic/core-for-CI.
Signed-off-by: Lucas De Marchi <[email protected]>
Acked-by: Jani Nikula <[email protected]>
thanks. Commit dropped from topic/core-for-CI
Lucas De Marchi
---
kernel/trace/Kconfig | 7 -------
kernel/trace/trace.c | 4 +++-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 012db82731e29..a3f35c7d83b6c 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -176,13 +176,6 @@ config TRACING
select TRACE_CLOCK
select NEED_TASKS_RCU
-config GLOBAL_TRACE_BUF_SIZE
- int
- prompt "Global ftrace buffer size (for trace_printk)" if EXPERT
- range 0 4194034
- default 1441792 # 16384 * 88 (sizeof(struct print_entry))
- depends on TRACING
-
config GENERIC_TRACER
bool
select TRACING
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index dc8ac10db04f2..95ae7c4e58357 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -950,7 +950,9 @@ int tracing_is_enabled(void)
* to not have to wait for all that output. Anyway this can be
* boot time and run time configurable.
*/
-static unsigned long trace_buf_size = CONFIG_GLOBAL_TRACE_BUF_SIZE;
+#define TRACE_BUF_SIZE_DEFAULT 1441792UL /* 16384 * 88 (sizeof(entry)) */
+
+static unsigned long trace_buf_size = TRACE_BUF_SIZE_DEFAULT;
/* trace_types holds a link list of available tracers. */
static struct tracer *trace_types __read_mostly;
--
Jani Nikula, Intel
