The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 248d327ed7b6d3ebda2ac7b38482a306108bcd3e Gitweb: https://git.kernel.org/tip/248d327ed7b6d3ebda2ac7b38482a306108bcd3e Author: Jisheng Zhang <Jisheng.Zhang@xxxxxxxxxxxxx> AuthorDate: Mon, 26 Aug 2019 09:13:12 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Mon, 26 Aug 2019 16:51:04 +02:00 x86/ftrace: Remove mcount() declaration Commit 562e14f72292 ("ftrace/x86: Remove mcount support") removed the support for mcount, but forgot to remove the mcount() declaration. Clean it up. Signed-off-by: Jisheng Zhang <Jisheng.Zhang@xxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r20190826170150.10f101ba@xhacker.debian --- arch/x86/include/asm/ftrace.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h index 287f1f7..c38a666 100644 --- a/arch/x86/include/asm/ftrace.h +++ b/arch/x86/include/asm/ftrace.h @@ -16,7 +16,6 @@ #define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR #ifndef __ASSEMBLY__ -extern void mcount(void); extern atomic_t modifying_ftrace_code; extern void __fentry__(void);
![]() |