Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Steven Rostedt Newsgroups: linux.kernel Subject: Re: [PATCH 2/5 v2] ftrace/x86-32: Move the ftrace specific code out of entry_32.S Date: Fri, 17 Mar 2017 14:40:02 +0100 Message-ID: References: X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 61 Organization: linux.* mail to news gateway X-Original-Cc: Ingo Molnar , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Masami Hiramatsu , "H. Peter Anvin" , Andy Lutomirski , Josh Poimboeuf , Linus Torvalds X-Original-Date: Fri, 17 Mar 2017 09:21:44 -0400 X-Original-Message-ID: <20170317092144.6d0f74f4@gandalf.local.home> X-Original-References: <20170316172008.086705006@goodmis.org> <20170316172056.326861206@goodmis.org> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1603311 On Thu, 16 Mar 2017 13:20:10 -0400 Steven Rostedt wrote: > From: "Steven Rostedt (VMware)" > > The function tracing hook code for ftrace is not an entry point from > userspace and does not belong in the entry_*.S files. It has already been > moved out of entry_64.S. This moves it out of entry_32.S into its own > ftrace_32.S file. > > Signed-off-by: Steven Rostedt (VMware) > --- > Makefile | 12 +-- > arch/x86/entry/entry_32.S | 168 ------------------------------------------ > arch/x86/kernel/Makefile | 1 + > arch/x86/kernel/ftrace_32.S | 176 ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 183 insertions(+), 174 deletions(-) > create mode 100644 arch/x86/kernel/ftrace_32.S > > diff --git a/Makefile b/Makefile > index b841fb36beb2..7df32471c206 100644 > --- a/Makefile > +++ b/Makefile > @@ -653,6 +653,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \ > # Tell gcc to never replace conditional load with a non-conditional one > KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0) > > +# check for 'asm goto' > +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) > + KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO > + KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO > +endif > + > include scripts/Makefile.gcc-plugins > > ifdef CONFIG_READABLE_ASM > @@ -798,12 +804,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) > # use the deterministic mode of AR if available > KBUILD_ARFLAGS := $(call ar-option,D) > > -# check for 'asm goto' > -ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) > - KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO > - KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO > -endif Nobody noticed that I accidentally committed someone else's change. :-p See http://lkml.kernel.org/r/20170310162411.GA18175@glebfm.cloud.tilaa.com I was testing his patch during development, and forgot to revert it. /me rebases. -- Steve > - > include scripts/Makefile.kasan > include scripts/Makefile.extrawarn > include scripts/Makefile.ubsan > diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S