From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935322AbcCJLEl (ORCPT ); Thu, 10 Mar 2016 06:04:41 -0500 Received: from torg.zytor.com ([198.137.202.12]:38118 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965816AbcCJLE2 (ORCPT ); Thu, 10 Mar 2016 06:04:28 -0500 Date: Thu, 10 Mar 2016 03:03:28 -0800 From: tip-bot for Andy Lutomirski Message-ID: Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, luto@kernel.org, oleg@redhat.com, mingo@kernel.org, bp@alien8.de, luto@amacapital.net, hpa@zytor.com, peterz@infradead.org, dvlasenk@redhat.com, andrew.cooper3@citrix.com, brgerst@gmail.com Reply-To: luto@amacapital.net, bp@alien8.de, mingo@kernel.org, oleg@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, luto@kernel.org, brgerst@gmail.com, dvlasenk@redhat.com, andrew.cooper3@citrix.com, peterz@infradead.org, hpa@zytor.com In-Reply-To: <9dbd18429f9ff61a76b6eda97a9ea20510b9f6ba.1457578375.git.luto@kernel.org> References: <9dbd18429f9ff61a76b6eda97a9ea20510b9f6ba.1457578375.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry: Only allocate space for tss_struct::SYSENTER_stack if needed Git-Commit-ID: 6dcc94149d605908a7c0c4cf2085340637aac86d 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: 6dcc94149d605908a7c0c4cf2085340637aac86d Gitweb: http://git.kernel.org/tip/6dcc94149d605908a7c0c4cf2085340637aac86d Author: Andy Lutomirski AuthorDate: Wed, 9 Mar 2016 19:00:31 -0800 Committer: Ingo Molnar CommitDate: Thu, 10 Mar 2016 09:48:14 +0100 x86/entry: Only allocate space for tss_struct::SYSENTER_stack if needed The SYSENTER stack is only used on 32-bit kernels. Remove it on 64-bit kernels. ( We may end up using it down the road on 64-bit kernels. If so, we'll re-enable it for CONFIG_IA32_EMULATION. ) Signed-off-by: Andy Lutomirski Cc: Andrew Cooper Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/9dbd18429f9ff61a76b6eda97a9ea20510b9f6ba.1457578375.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/processor.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index ecb4103..7cd01b7 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -297,10 +297,12 @@ struct tss_struct { */ unsigned long io_bitmap[IO_BITMAP_LONGS + 1]; +#ifdef CONFIG_X86_32 /* * Space for the temporary SYSENTER stack: */ unsigned long SYSENTER_stack[64]; +#endif } ____cacheline_aligned;