aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-28 18:53:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-28 18:53:22 +0200
commited1b3f4c4fc35babaa44246c711ab728dbc9721b (patch)
tree7e4185580ab82c9c43598c8cb66c17363a4ac9a8
parentMerge tag 'pci-v4.19-fixes-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (diff)
parentRISC-V: include linux/ftrace.h in asm-prototypes.h (diff)
downloadlinux-dev-ed1b3f4c4fc35babaa44246c711ab728dbc9721b.tar.xz
linux-dev-ed1b3f4c4fc35babaa44246c711ab728dbc9721b.zip
Merge tag 'riscv-for-linus-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
Palmer writes: "A Single RISC-V Update for 4.19-rc6 The Debian guys have been pushing on our port and found some unversioned symbols leaking into modules. This PR contains a single fix for that issue." * tag 'riscv-for-linus-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux: RISC-V: include linux/ftrace.h in asm-prototypes.h
-rw-r--r--arch/riscv/include/asm/asm-prototypes.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/riscv/include/asm/asm-prototypes.h b/arch/riscv/include/asm/asm-prototypes.h
new file mode 100644
index 000000000000..c9fecd120d18
--- /dev/null
+++ b/arch/riscv/include/asm/asm-prototypes.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_RISCV_PROTOTYPES_H
+
+#include <linux/ftrace.h>
+#include <asm-generic/asm-prototypes.h>
+
+#endif /* _ASM_RISCV_PROTOTYPES_H */