Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757136AbbGGKyQ (ORCPT ); Tue, 7 Jul 2015 06:54:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60050 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756532AbbGGKyG (ORCPT ); Tue, 7 Jul 2015 06:54:06 -0400 Date: Tue, 7 Jul 2015 03:53:09 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: linux-kernel@vger.kernel.org, brgerst@gmail.com, torvalds@linux-foundation.org, hpa@zytor.com, oleg@redhat.com, luto@kernel.org, bp@alien8.de, keescook@chromium.org, peterz@infradead.org, mingo@kernel.org, luto@amacapital.net, riel@redhat.com, tglx@linutronix.de, dvlasenk@redhat.com, vda.linux@googlemail.com, fweisbec@gmail.com Reply-To: hpa@zytor.com, brgerst@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, keescook@chromium.org, bp@alien8.de, mingo@kernel.org, peterz@infradead.org, oleg@redhat.com, luto@kernel.org, luto@amacapital.net, fweisbec@gmail.com, vda.linux@googlemail.com, riel@redhat.com, dvlasenk@redhat.com, tglx@linutronix.de In-Reply-To: <3a0481f809dd340c7d3f54ce3fd6d66ef2a578cd.1435952415.git.luto@kernel.org> References: <3a0481f809dd340c7d3f54ce3fd6d66ef2a578cd.1435952415.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Simplify IRQ stack pt_regs handling Git-Commit-ID: a586f98e9767fb0dfdb989002866b4024f00ce08 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: 2326 Lines: 68 Commit-ID: a586f98e9767fb0dfdb989002866b4024f00ce08 Gitweb: http://git.kernel.org/tip/a586f98e9767fb0dfdb989002866b4024f00ce08 Author: Andy Lutomirski AuthorDate: Fri, 3 Jul 2015 12:44:30 -0700 Committer: Ingo Molnar CommitDate: Tue, 7 Jul 2015 10:59:08 +0200 x86/asm/entry/64: Simplify IRQ stack pt_regs handling There's no need for both RSI and RDI to point to the original stack. Signed-off-by: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Denys Vlasenko Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: paulmck@linux.vnet.ibm.com Link: http://lkml.kernel.org/r/3a0481f809dd340c7d3f54ce3fd6d66ef2a578cd.1435952415.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 65029f4..83eb63d 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -506,8 +506,6 @@ END(irq_entries_start) SAVE_C_REGS SAVE_EXTRA_REGS - movq %rsp,%rdi /* arg1 for \func (pointer to pt_regs) */ - testb $3, CS(%rsp) jz 1f SWAPGS @@ -519,14 +517,14 @@ END(irq_entries_start) * a little cheaper to use a separate counter in the PDA (short of * moving irq_enter into assembly, which would be too much work) */ - movq %rsp, %rsi + movq %rsp, %rdi incl PER_CPU_VAR(irq_count) cmovzq PER_CPU_VAR(irq_stack_ptr), %rsp - pushq %rsi + pushq %rdi /* We entered an interrupt context - irqs are off: */ TRACE_IRQS_OFF - call \func + call \func /* rdi points to pt_regs */ .endm /* -- 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/