Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933684AbdCWJVJ (ORCPT ); Thu, 23 Mar 2017 05:21:09 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50359 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932070AbdCWJVH (ORCPT ); Thu, 23 Mar 2017 05:21:07 -0400 Date: Thu, 23 Mar 2017 02:14:09 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: brgerst@gmail.com, torvalds@linux-foundation.org, ard.biesheuvel@linaro.org, dvlasenk@redhat.com, jpoimboe@redhat.com, bp@alien8.de, thgarnie@google.com, peterz@infradead.org, matt@codeblueprint.co.uk, hpa@zytor.com, luto@kernel.org, tglx@linutronix.de, boris.ostrovsky@oracle.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jgross@suse.com Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, boris.ostrovsky@oracle.com, luto@kernel.org, tglx@linutronix.de, hpa@zytor.com, matt@codeblueprint.co.uk, jgross@suse.com, dvlasenk@redhat.com, ard.biesheuvel@linaro.org, torvalds@linux-foundation.org, brgerst@gmail.com, peterz@infradead.org, bp@alien8.de, thgarnie@google.com, jpoimboe@redhat.com In-Reply-To: <5ba1d3ffca85e1a5b3ac99265ebe55df4cf0dbe4.1490218061.git.luto@kernel.org> References: <5ba1d3ffca85e1a5b3ac99265ebe55df4cf0dbe4.1490218061.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/efi/32: Fix EFI on systems where the per-cpu GDT is virtually mapped Git-Commit-ID: 3fa1cabbc3b61224ef33d3ca4a1a96998529bc68 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: 1811 Lines: 46 Commit-ID: 3fa1cabbc3b61224ef33d3ca4a1a96998529bc68 Gitweb: http://git.kernel.org/tip/3fa1cabbc3b61224ef33d3ca4a1a96998529bc68 Author: Andy Lutomirski AuthorDate: Wed, 22 Mar 2017 14:32:31 -0700 Committer: Ingo Molnar CommitDate: Thu, 23 Mar 2017 08:25:07 +0100 x86/efi/32: Fix EFI on systems where the per-cpu GDT is virtually mapped __pa() on a per-cpu pointer is invalid. This bug appears to go *waaay* back, and I guess it's just never been triggered. Signed-off-by: Andy Lutomirski Cc: Ard Biesheuvel Cc: Boris Ostrovsky Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Linus Torvalds Cc: Matt Fleming Cc: Peter Zijlstra Cc: Thomas Garnier Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/5ba1d3ffca85e1a5b3ac99265ebe55df4cf0dbe4.1490218061.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/platform/efi/efi_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c index 9500711..3481268 100644 --- a/arch/x86/platform/efi/efi_32.c +++ b/arch/x86/platform/efi/efi_32.c @@ -68,7 +68,7 @@ pgd_t * __init efi_call_phys_prolog(void) load_cr3(initial_page_table); __flush_tlb_all(); - gdt_descr.address = __pa(get_cpu_gdt_rw(0)); + gdt_descr.address = get_cpu_gdt_paddr(0); gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr);