Merge tag 'parisc-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

torvalds · torvalds · commit 9160b68e0cf8 · 2024-11-26T14:49:20.000-08:00
Pull parisc architecture update from Helge Deller:

 - Fix function graph tracing disablement on parisc

* tag 'parisc-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc/ftrace: Fix function graph tracing disablement
diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c
@@ -87,7 +87,7 @@ int ftrace_enable_ftrace_graph_caller(void)
 
 int ftrace_disable_ftrace_graph_caller(void)
 {
-	static_key_enable(&ftrace_graph_enable.key);
+	static_key_disable(&ftrace_graph_enable.key);
 	return 0;
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ int ftrace_enable_ftrace_graph_caller(void)`
`87`	`87`
`88`	`88`	`int ftrace_disable_ftrace_graph_caller(void)`
`89`	`89`	`{`
`90`		`- static_key_enable(&ftrace_graph_enable.key);`
	`90`	`+ static_key_disable(&ftrace_graph_enable.key);`
`91`	`91`	`return 0;`
`92`	`92`	`}`
`93`	`93`	`#endif`