Commit-ID: db65d7b6dcd313ad54c3589813f70b805dbb48ec Gitweb: http://git.kernel.org/tip/db65d7b6dcd313ad54c3589813f70b805dbb48ec Author: Steven Rostedt (VMware) <rost...@goodmis.org> AuthorDate: Thu, 23 Mar 2017 10:33:48 -0400 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Fri, 24 Mar 2017 10:14:06 +0100
x86/ftrace: Rename mcount_64.S to ftrace_64.S With the advent of -mfentry that uses the new "fentry" hook over mcount, the mcount name is obsolete. Having the code file that ftrace hooks into called "mcount*.S" is rather misleading. Rename it to ftrace_64.S and remove the file name reference. Signed-off-by: Steven Rostedt (VMware) <rost...@goodmis.org> Reviewed-by: Ingo Molnar <mi...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Masami Hiramatsu <mhira...@kernel.org> Cc: Josh Poimboeuf <jpoim...@redhat.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Link: http://lkml.kernel.org/r/20170323143445.490601...@goodmis.org Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- arch/x86/kernel/Makefile | 4 ++-- arch/x86/kernel/{mcount_64.S => ftrace_64.S} | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 84c0059..d3743a37 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -27,7 +27,7 @@ KASAN_SANITIZE_stacktrace.o := n OBJECT_FILES_NON_STANDARD_head_$(BITS).o := y OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o := y -OBJECT_FILES_NON_STANDARD_mcount_$(BITS).o := y +OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o := y OBJECT_FILES_NON_STANDARD_test_nx.o := y # If instrumentation of this dir is enabled, boot hangs during first second. @@ -46,7 +46,7 @@ obj-$(CONFIG_MODIFY_LDT_SYSCALL) += ldt.o obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o -obj-$(CONFIG_X86_64) += sys_x86_64.o mcount_64.o +obj-$(CONFIG_X86_64) += sys_x86_64.o ftrace_64.o obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o obj-y += bootflag.o e820.o diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/ftrace_64.S similarity index 99% rename from arch/x86/kernel/mcount_64.S rename to arch/x86/kernel/ftrace_64.S index 7b0d3da..d1be3cb 100644 --- a/arch/x86/kernel/mcount_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -1,6 +1,4 @@ /* - * linux/arch/x86_64/mcount_64.S - * * Copyright (C) 2014 Steven Rostedt, Red Hat Inc */
