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

9160b68e · Linus Torvalds <[email protected]> · 2024-11-26 14:49:20 -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

Commit: 9160b68e0cf8d57243f17debcb564ce01e327ada
Parents: 7ebe7afe · a5f05a13

Merge commit. Changes below are compared with the first parent: 7ebe7afe.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/parisc/kernel/ftrace.c	modified	+1	−1	View file

arch/parisc/kernel/ftrace.c

View file

diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c
index 3e34b44..10fd5b3 100644
--- 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