2 files changed, 6 insertions, 4 deletions

diff --git a/kernel/stackleak.c b/kernel/stackleak.c
index 08cb57eed389..b193a59fc05b 100644
--- a/kernel/stackleak.c
+++ b/kernel/stackleak.c
@@ -104,7 +104,7 @@ asmlinkage void notrace stackleak_erase(void)
 }
 NOKPROBE_SYMBOL(stackleak_erase);
 
-void __used stackleak_track_stack(void)
+void __used notrace stackleak_track_stack(void)
 {
         /*
          * N.B. stackleak_erase() fills the kernel stack with the poison value,
diff --git a/scripts/gcc-plugins/stackleak_plugin.c b/scripts/gcc-plugins/stackleak_plugin.c
index 2f48da98b5d4..dbd37460c573 100644
--- a/scripts/gcc-plugins/stackleak_plugin.c
+++ b/scripts/gcc-plugins/stackleak_plugin.c
@@ -363,10 +363,12 @@ __visible int plugin_init(struct plugin_name_args *plugin_info,
                                                 PASS_POS_INSERT_BEFORE);
 
         /*
-         * The stackleak_cleanup pass should be executed after the
-         * "reload" pass, when the stack frame size is final.
+         * The stackleak_cleanup pass should be executed before the "*free_cfg"
+         * pass. It's the moment when the stack frame size is already final,
+         * function prologues and epilogues are generated, and the
+         * machine-dependent code transformations are not done.
          */
-        PASS_INFO(stackleak_cleanup, "reload", 1, PASS_POS_INSERT_AFTER);
+        PASS_INFO(stackleak_cleanup, "*free_cfg", 1, PASS_POS_INSERT_BEFORE);
 
         if (!plugin_default_version_check(version, &gcc_version)) {
                 error(G_("incompatible gcc/plugin versions"));