Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db65d7b6 authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware) Committed by Thomas Gleixner
Browse files

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: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20170323143445.490601451@goodmis.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4ccb6aea

arch/x86/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/mcount_64.S→arch/x86/kernel/ftrace_64.S

+0 −2
Original line number Diff line number Diff line 
/*

 *  linux/arch/x86_64/mcount_64.S

 *

 *  Copyright (C) 2014  Steven Rostedt, Red Hat Inc

 */