From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755186AbcASNlc (ORCPT ); Tue, 19 Jan 2016 08:41:32 -0500 Received: from terminus.zytor.com ([198.137.202.10]:44005 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755128AbcASNlY (ORCPT ); Tue, 19 Jan 2016 08:41:24 -0500 Date: Tue, 19 Jan 2016 05:40:02 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: torvalds@linux-foundation.org, mmarek@suse.cz, tglx@linutronix.de, acme@kernel.org, jslaby@suse.cz, linux-kernel@vger.kernel.org, luto@amacapital.net, luto@kernel.org, dvlasenk@redhat.com, namhyung@gmail.com, palves@redhat.com, mingo@kernel.org, jpoimboe@redhat.com, chris.j.arges@canonical.com, hpa@zytor.com, peterz@infradead.org, bernd@petrovitsch.priv.at, bp@alien8.de, brgerst@gmail.com Reply-To: bernd@petrovitsch.priv.at, bp@alien8.de, brgerst@gmail.com, jpoimboe@redhat.com, chris.j.arges@canonical.com, hpa@zytor.com, peterz@infradead.org, palves@redhat.com, mingo@kernel.org, dvlasenk@redhat.com, namhyung@gmail.com, jslaby@suse.cz, luto@amacapital.net, linux-kernel@vger.kernel.org, luto@kernel.org, mmarek@suse.cz, torvalds@linux-foundation.org, tglx@linutronix.de, acme@kernel.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm: Add C versions of frame pointer macros Git-Commit-ID: ec5186557abbe711dfd34e1863735dfecb0602cc 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: ec5186557abbe711dfd34e1863735dfecb0602cc Gitweb: http://git.kernel.org/tip/ec5186557abbe711dfd34e1863735dfecb0602cc Author: Josh Poimboeuf AuthorDate: Fri, 18 Dec 2015 06:39:19 -0600 Committer: Ingo Molnar CommitDate: Tue, 19 Jan 2016 12:59:07 +0100 x86/asm: Add C versions of frame pointer macros Add C versions of the frame pointer macros which can be used to create a stack frame in inline assembly. Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Arnaldo Carvalho de Melo Cc: Bernd Petrovitsch Cc: Borislav Petkov Cc: Brian Gerst Cc: Chris J Arges Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jiri Slaby Cc: Linus Torvalds Cc: Michal Marek Cc: Namhyung Kim Cc: Pedro Alves Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/f6786a282bf232ede3e2866414eae3cf02c7d662.1450442274.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/frame.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/frame.h b/arch/x86/include/asm/frame.h index cec213b..6e4d170 100644 --- a/arch/x86/include/asm/frame.h +++ b/arch/x86/include/asm/frame.h @@ -1,16 +1,17 @@ #ifndef _ASM_X86_FRAME_H #define _ASM_X86_FRAME_H -#ifdef __ASSEMBLY__ - #include /* * These are stack frame creation macros. They should be used by every * callable non-leaf asm function to make kernel stack traces more reliable. */ + #ifdef CONFIG_FRAME_POINTER +#ifdef __ASSEMBLY__ + .macro FRAME_BEGIN push %_ASM_BP _ASM_MOV %_ASM_SP, %_ASM_BP @@ -20,6 +21,16 @@ pop %_ASM_BP .endm +#else /* !__ASSEMBLY__ */ + +#define FRAME_BEGIN \ + "push %" _ASM_BP "\n" \ + _ASM_MOV "%" _ASM_SP ", %" _ASM_BP "\n" + +#define FRAME_END "pop %" _ASM_BP "\n" + +#endif /* __ASSEMBLY__ */ + #define FRAME_OFFSET __ASM_SEL(4, 8) #else /* !CONFIG_FRAME_POINTER */ @@ -30,5 +41,4 @@ #endif /* CONFIG_FRAME_POINTER */ -#endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_FRAME_H */