diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-03 09:33:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-03 09:33:30 +0200 |
| commit | cd8fe5b6dbb3a487bea5f1601437c013a3d56163 (patch) | |
| tree | ba029308f2a2a1d8d4880b0bf84d4972bb501715 /arch/riscv/include/asm/ftrace.h | |
| parent | 43ba3d4af7a73ae958207caada6af0612d67f08e (diff) | |
| parent | 7e364e56293bb98cae1b55fd835f5991c4e96e7d (diff) | |
| download | lwn-cd8fe5b6dbb3a487bea5f1601437c013a3d56163.tar.gz lwn-cd8fe5b6dbb3a487bea5f1601437c013a3d56163.zip | |
Merge 6.3-rc5 into driver-core-next
We need the fixes in here for testing, as well as the driver core
changes for documentation updates to build on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/riscv/include/asm/ftrace.h')
| -rw-r--r-- | arch/riscv/include/asm/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrace.h index 9e73922e1e2e..d47d87c2d7e3 100644 --- a/arch/riscv/include/asm/ftrace.h +++ b/arch/riscv/include/asm/ftrace.h @@ -109,6 +109,6 @@ int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec); #define ftrace_init_nop ftrace_init_nop #endif -#endif +#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* _ASM_RISCV_FTRACE_H */ |