From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752779AbbC1Ikn (ORCPT ); Sat, 28 Mar 2015 04:40:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47969 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751272AbbC1Iki (ORCPT ); Sat, 28 Mar 2015 04:40:38 -0400 Date: Sat, 28 Mar 2015 01:39:35 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: oleg@redhat.com, ast@plumgrid.com, keescook@chromium.org, luto@amacapital.net, dvlasenk@redhat.com, rostedt@goodmis.org, hpa@zytor.com, bp@alien8.de, torvalds@linux-foundation.org, mingo@kernel.org, fweisbec@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, wad@chromium.org Reply-To: wad@chromium.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, fweisbec@gmail.com, mingo@kernel.org, torvalds@linux-foundation.org, rostedt@goodmis.org, dvlasenk@redhat.com, bp@alien8.de, hpa@zytor.com, luto@amacapital.net, keescook@chromium.org, ast@plumgrid.com, oleg@redhat.com In-Reply-To: <1427452582-21624-1-git-send-email-dvlasenk@redhat.com> References: <1427452582-21624-1-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Add missing CFI annotation Git-Commit-ID: 27be87c5d53117f048d590d6fc6febb21176c3e9 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: 27be87c5d53117f048d590d6fc6febb21176c3e9 Gitweb: http://git.kernel.org/tip/27be87c5d53117f048d590d6fc6febb21176c3e9 Author: Denys Vlasenko AuthorDate: Fri, 27 Mar 2015 11:36:19 +0100 Committer: Ingo Molnar CommitDate: Fri, 27 Mar 2015 12:27:57 +0100 x86/asm/entry/64: Add missing CFI annotation This is a missing bit of the recent MOV-to-PUSH conversion. Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Will Drewry Link: http://lkml.kernel.org/r/1427452582-21624-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 f85d2cc..dbfc8875 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -248,6 +248,7 @@ GLOBAL(system_call_after_swapgs) pushq_cfi_reg r10 /* pt_regs->r10 */ pushq_cfi_reg r11 /* pt_regs->r11 */ sub $(6*8),%rsp /* pt_regs->bp,bx,r12-15 not saved */ + CFI_ADJUST_CFA_OFFSET 6*8 testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS) jnz tracesys