From: Luis Chamberlain <mcgrof@kernel.org>
Date: Thu, 21 Apr 2022 18:38:43 +0000 (-0700)
Subject: ftrace: fix building with SYSCTL=y but DYNAMIC_FTRACE=n
X-Git-Tag: v5.19-rc1~132^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fd7c2144d1292f15c901211750dee021ed5079a;p=thirdparty%2Fkernel%2Flinux.git

ftrace: fix building with SYSCTL=y but DYNAMIC_FTRACE=n

Ok so hopefully this is the last of it. 0day picked up a build
failure [0] when SYSCTL=y but DYNAMIC_FTRACE=n. This can be fixed
by just declaring an empty routine for the calls moved just
recently.

[0] https://lkml.kernel.org/r/202204161203.6dSlgKJX-lkp@intel.com

Reported-by: kernel test robot <lkp@intel.com>
Fixes: f8b7d2b4c192 ("ftrace: fix building with SYSCTL=n but DYNAMIC_FTRACE=y")
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index d9424fd9a1838..1f89039f0febb 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -7873,6 +7873,8 @@ int unregister_ftrace_function(struct ftrace_ops *ops)
 EXPORT_SYMBOL_GPL(unregister_ftrace_function);
 
 #ifdef CONFIG_SYSCTL
+
+#ifdef CONFIG_DYNAMIC_FTRACE
 static void ftrace_startup_sysctl(void)
 {
 	int command;
@@ -7906,6 +7908,10 @@ static void ftrace_shutdown_sysctl(void)
 		ftrace_run_update_code(command);
 	}
 }
+#else
+# define ftrace_startup_sysctl()       do { } while (0)
+# define ftrace_shutdown_sysctl()      do { } while (0)
+#endif /* CONFIG_DYNAMIC_FTRACE */
 
 static bool is_permanent_ops_registered(void)
 {