From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751286AbdCRVM3 (ORCPT ); Sat, 18 Mar 2017 17:12:29 -0400 Received: from mail.kernel.org ([198.145.29.136]:40044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751143AbdCRVMZ (ORCPT ); Sat, 18 Mar 2017 17:12:25 -0400 Message-Id: <20170318211148.885064718@goodmis.org> User-Agent: quilt/0.63-1 Date: Sat, 18 Mar 2017 17:09:24 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Masami Hiramatsu , "H. Peter Anvin" , Andy Lutomirski , Josh Poimboeuf , Linus Torvalds Subject: [PATCH 1/6 v3] ftrace/x86_64: Rename mcount_64.S to ftrace_64.S References: <20170318210923.814509382@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0001-ftrace-x86_64-Rename-mcount_64.S-to-ftrace_64.S.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Steven Rostedt (VMware)" 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 Signed-off-by: Steven Rostedt (VMware) --- arch/x86/kernel/Makefile | 4 ++-- arch/x86/kernel/{mcount_64.S => ftrace_64.S} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename arch/x86/kernel/{mcount_64.S => ftrace_64.S} (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 84c00592d359..d3743a37e990 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 100% rename from arch/x86/kernel/mcount_64.S rename to arch/x86/kernel/ftrace_64.S -- 2.10.2