From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965542AbdCXJ0C (ORCPT ); Fri, 24 Mar 2017 05:26:02 -0400 Received: from terminus.zytor.com ([65.50.211.136]:49425 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964984AbdCXJY5 (ORCPT ); Fri, 24 Mar 2017 05:24:57 -0400 Date: Fri, 24 Mar 2017 02:19:22 -0700 From: "tip-bot for Steven Rostedt (VMware)" Message-ID: Cc: luto@amacapital.net, mhiramat@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, akpm@linux-foundation.org, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, rostedt@goodmis.org Reply-To: akpm@linux-foundation.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mhiramat@kernel.org, luto@amacapital.net, torvalds@linux-foundation.org, tglx@linutronix.de, rostedt@goodmis.org, mingo@kernel.org, hpa@zytor.com In-Reply-To: <20170323143445.490601451@goodmis.org> References: <20170323143445.490601451@goodmis.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/ftrace: Rename mcount_64.S to ftrace_64.S Git-Commit-ID: db65d7b6dcd313ad54c3589813f70b805dbb48ec X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: db65d7b6dcd313ad54c3589813f70b805dbb48ec Gitweb: http://git.kernel.org/tip/db65d7b6dcd313ad54c3589813f70b805dbb48ec Author: Steven Rostedt (VMware) AuthorDate: Thu, 23 Mar 2017 10:33:48 -0400 Committer: Thomas Gleixner 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) Reviewed-by: Ingo Molnar Cc: Peter Zijlstra Cc: Andy Lutomirski Cc: Masami Hiramatsu Cc: Josh Poimboeuf Cc: Andrew Morton Cc: Linus Torvalds Link: http://lkml.kernel.org/r/20170323143445.490601451@goodmis.org Signed-off-by: Thomas Gleixner --- 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 */