diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-26 23:49:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-26 23:49:20 +0100 |
| commit | 9160b68e0cf8d57243f17debcb564ce01e327ada (patch) | |
| tree | 7ac92e1bb7094ebbc375db4de8b17802434257c4 | |
| parent | Merge tag 'm68knommu-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | parisc/ftrace: Fix function graph tracing disablement (diff) | |
| download | linux-9160b68e0cf8d57243f17debcb564ce01e327ada.tar.xz linux-9160b68e0cf8d57243f17debcb564ce01e327ada.zip | |
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
| -rw-r--r-- | arch/parisc/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c index 3e34b4473d3a..10fd5b3e63e7 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 |