Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753051AbbDHHo2 (ORCPT ); Wed, 8 Apr 2015 03:44:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34873 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752616AbbDHHoW (ORCPT ); Wed, 8 Apr 2015 03:44:22 -0400 Date: Wed, 8 Apr 2015 00:43:51 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: mingo@kernel.org, wad@chromium.org, tglx@linutronix.de, brgerst@gmail.com, ast@plumgrid.com, rostedt@goodmis.org, keescook@chromium.org, luto@amacapital.net, fweisbec@gmail.com, hpa@zytor.com, bp@alien8.de, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, oleg@redhat.com Reply-To: linux-kernel@vger.kernel.org, hpa@zytor.com, bp@alien8.de, dvlasenk@redhat.com, oleg@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, wad@chromium.org, brgerst@gmail.com, fweisbec@gmail.com, luto@amacapital.net, keescook@chromium.org, rostedt@goodmis.org, ast@plumgrid.com In-Reply-To: <1428424967-14460-1-git-send-email-dvlasenk@redhat.com> References: <1428424967-14460-1-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Add forgotten CFI annotation Git-Commit-ID: 8b3607b5b8c591d8bf045911cb7c90ecaa6e7b73 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 Content-Length: 1718 Lines: 45 Commit-ID: 8b3607b5b8c591d8bf045911cb7c90ecaa6e7b73 Gitweb: http://git.kernel.org/tip/8b3607b5b8c591d8bf045911cb7c90ecaa6e7b73 Author: Denys Vlasenko AuthorDate: Tue, 7 Apr 2015 18:42:47 +0200 Committer: Ingo Molnar CommitDate: Wed, 8 Apr 2015 09:18:36 +0200 x86/asm/entry/64: Add forgotten CFI annotation Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Will Drewry Link: http://lkml.kernel.org/r/1428424967-14460-1-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 4ca03c5..3197f41 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -506,6 +506,7 @@ return_from_execve: 1: /* must use IRET code path (pt_regs->cs may have changed) */ addq $8, %rsp + CFI_ADJUST_CFA_OFFSET -8 ZERO_EXTRA_REGS movq %rax,RAX(%rsp) jmp int_ret_from_sys_call -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/