Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 19 Jul 2018 16:18:51 -0700
From:   tip-bot for Joerg Roedel <tipbot@zytor.com>
Message-ID: <tip-9e97b73fdb235345a826519862a52a7398c89eb8@git.kernel.org>
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
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> 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

Commit-ID:  9e97b73fdb235345a826519862a52a7398c89eb8
Gitweb:     https://git.kernel.org/tip/9e97b73fdb235345a826519862a52a7398c89eb8
Author:     Joerg Roedel <jroedel@suse.de>
AuthorDate: Wed, 18 Jul 2018 11:40:38 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
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 <jroedel@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Cc: "H . Peter Anvin" <hpa@zytor.com>
Cc: linux-mm@kvack.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David Laight <David.Laight@aculab.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Eduardo Valentin <eduval@amazon.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: aliguori@amazon.com
Cc: daniel.gruss@iaik.tugraz.at
Cc: hughd@google.com
Cc: keescook@google.com
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Waiman Long <llong@redhat.com>
Cc: "David H . Gutteridge" <dhgutteridge@sympatico.ca>
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