Commit 9160b68e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.13-rc1' of... 

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

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
parents 7ebe7afe a5f05a13

arch/parisc/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -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