diff options
author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
---|---|---|
committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
commit | f757b390faab6c38fe0887dc2123dcb615e21953 (patch) | |
tree | bd3a7c81a775c362693bccaf00e2cef9e07e2eea /kernel/trace | |
parent | 443c053f51f9173042a2b45d0db7271cebe78198 (diff) | |
parent | 4c82fd0506b4cc196a375d1200361fb0c5439acd (diff) |
Merge remote-tracking branch 'drm-intel/topic/core-for-CI' into drm-tip
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/Kconfig | 7 | ||||
-rw-r--r-- | kernel/trace/trace.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 420ff4bc67fd..a2e963985a29 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -121,6 +121,13 @@ config TRACING select EVENT_TRACING select TRACE_CLOCK +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 88de94da596b..60249f9f8d5c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -797,9 +797,7 @@ int tracing_is_enabled(void) * to not have to wait for all that output. Anyway this can be * boot time and run time configurable. */ -#define TRACE_BUF_SIZE_DEFAULT 1441792UL /* 16384 * 88 (sizeof(entry)) */ - -static unsigned long trace_buf_size = TRACE_BUF_SIZE_DEFAULT; +static unsigned long trace_buf_size = CONFIG_GLOBAL_TRACE_BUF_SIZE; /* trace_types holds a link list of available tracers. */ static struct tracer *trace_types __read_mostly; |