Commit 8d8d276b authored Sep 10, 2024 by Linus Torvalds

linux-trace

Pull tracing fixes from Steven Rostedt:

 - Move declaration of interface_lock outside of CONFIG_TIMERLAT_TRACER

   The fix to some locking races moved the declaration of the
   interface_lock up in the file, but also moved it into the
   CONFIG_TIMERLAT_TRACER #ifdef block, breaking the build when that
   wasn't set. Move it further up and out of that #ifdef block.

 - Remove unused function run_tracer_selftest() stub

   When CONFIG_FTRACE_STARTUP_TEST is not set the stub function
   run_tracer_selftest() is not used and clang is warning about it.
   Remove the function stub as it is not needed.

* tag 'trace-v6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: Drop unused helper function to fix the build
  tracing/osnoise: Fix build when timerlat is not enabled

parents bc83b4d1 4e378158

kernel/trace/trace.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2226,10 +2226,6 @@ static __init int init_trace_selftests(void)
		}
		core_initcall(init_trace_selftests);
		#else
		static inline int run_tracer_selftest(struct tracer *type)
		{
		return 0;
		}
		static inline int do_run_tracer_selftest(struct tracer *type)
		{
		return 0;

kernel/trace/trace_osnoise.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -228,6 +228,11 @@ static inline struct osnoise_variables *this_cpu_osn_var(void)
		return this_cpu_ptr(&per_cpu_osnoise_var);
		}

		/*
		* Protect the interface.
		*/
		static struct mutex interface_lock;

		#ifdef CONFIG_TIMERLAT_TRACER
		/*
		* Runtime information for the timer mode.
		@@ -252,11 +257,6 @@ static inline struct timerlat_variables *this_cpu_tmr_var(void)
		return this_cpu_ptr(&per_cpu_timerlat_var);
		}

		/*
		* Protect the interface.
		*/
		static struct mutex interface_lock;

		/*
		* tlat_var_reset - Reset the values of the given timerlat_variables
		*/