From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD6B4ECDFB8 for ; Thu, 19 Jul 2018 23:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6276020673 for ; Thu, 19 Jul 2018 23:20:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6276020673 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zytor.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730798AbeGTAFZ (ORCPT ); Thu, 19 Jul 2018 20:05:25 -0400 Received: from terminus.zytor.com ([198.137.202.136]:42525 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729919AbeGTAFZ (ORCPT ); Thu, 19 Jul 2018 20:05:25 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id w6JNIrdE2450839 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 19 Jul 2018 16:18:53 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w6JNIp6A2450836; Thu, 19 Jul 2018 16:18:51 -0700 Date: Thu, 19 Jul 2018 16:18:51 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Joerg Roedel Message-ID: Cc: brgerst@gmail.com, peterz@infradead.org, jroedel@suse.de, torvalds@linux-foundation.org, jgross@suse.com, gregkh@linuxfoundation.org, jpoimboe@redhat.com, luto@kernel.org, hpa@zytor.com, dvlasenk@redhat.com, eduval@amazon.com, mingo@kernel.org, dhgutteridge@sympatico.ca, bp@alien8.de, boris.ostrovsky@oracle.com, linux-kernel@vger.kernel.org, aarcange@redhat.com, dave.hansen@intel.com, pavel@ucw.cz, tglx@linutronix.de, will.deacon@arm.com, David.Laight@aculab.com, jkosina@suse.cz, llong@redhat.com Reply-To: peterz@infradead.org, brgerst@gmail.com, jgross@suse.com, torvalds@linux-foundation.org, jroedel@suse.de, luto@kernel.org, gregkh@linuxfoundation.org, jpoimboe@redhat.com, eduval@amazon.com, dvlasenk@redhat.com, hpa@zytor.com, dhgutteridge@sympatico.ca, mingo@kernel.org, dave.hansen@intel.com, aarcange@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, boris.ostrovsky@oracle.com, llong@redhat.com, David.Laight@aculab.com, jkosina@suse.cz, will.deacon@arm.com, pavel@ucw.cz, tglx@linutronix.de In-Reply-To: <1531906876-13451-2-git-send-email-joro@8bytes.org> References: <1531906876-13451-2-git-send-email-joro@8bytes.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/asm-offsets: Move TSS_sp0 and TSS_sp1 to asm-offsets.c Git-Commit-ID: 9e97b73fdb235345a826519862a52a7398c89eb8 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9e97b73fdb235345a826519862a52a7398c89eb8 Gitweb: https://git.kernel.org/tip/9e97b73fdb235345a826519862a52a7398c89eb8 Author: Joerg Roedel AuthorDate: Wed, 18 Jul 2018 11:40:38 +0200 Committer: Thomas Gleixner CommitDate: Fri, 20 Jul 2018 01:11:35 +0200 x86/asm-offsets: Move TSS_sp0 and TSS_sp1 to asm-offsets.c These offsets will be used in 32 bit assembly code as well, so make them available for all of x86 code. Signed-off-by: Joerg Roedel Signed-off-by: Thomas Gleixner Tested-by: Pavel Machek Reviewed-by: Andy Lutomirski Cc: "H . Peter Anvin" Cc: linux-mm@kvack.org Cc: Linus Torvalds Cc: Dave Hansen Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Peter Zijlstra Cc: Borislav Petkov Cc: Jiri Kosina Cc: Boris Ostrovsky Cc: Brian Gerst Cc: David Laight Cc: Denys Vlasenko Cc: Eduardo Valentin Cc: Greg KH Cc: Will Deacon Cc: aliguori@amazon.com Cc: daniel.gruss@iaik.tugraz.at Cc: hughd@google.com Cc: keescook@google.com Cc: Andrea Arcangeli Cc: Waiman Long Cc: "David H . Gutteridge" Cc: joro@8bytes.org Link: https://lkml.kernel.org/r/1531906876-13451-2-git-send-email-joro@8bytes.org --- arch/x86/kernel/asm-offsets.c | 4 ++++ arch/x86/kernel/asm-offsets_64.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c index dcb008c320fe..a1e16286a832 100644 --- a/arch/x86/kernel/asm-offsets.c +++ b/arch/x86/kernel/asm-offsets.c @@ -103,4 +103,8 @@ void common(void) { OFFSET(CPU_ENTRY_AREA_entry_trampoline, cpu_entry_area, entry_trampoline); OFFSET(CPU_ENTRY_AREA_entry_stack, cpu_entry_area, entry_stack_page); DEFINE(SIZEOF_entry_stack, sizeof(struct entry_stack)); + + /* Offset for sp0 and sp1 into the tss_struct */ + OFFSET(TSS_sp0, tss_struct, x86_tss.sp0); + OFFSET(TSS_sp1, tss_struct, x86_tss.sp1); } diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index b2dcd161f514..3b9405e7ba2b 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -65,8 +65,6 @@ int main(void) #undef ENTRY OFFSET(TSS_ist, tss_struct, x86_tss.ist); - OFFSET(TSS_sp0, tss_struct, x86_tss.sp0); - OFFSET(TSS_sp1, tss_struct, x86_tss.sp1); BLANK(); #ifdef CONFIG_STACKPROTECTOR