From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751225AbdFEPlE (ORCPT ); Mon, 5 Jun 2017 11:41:04 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34352 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751077AbdFEPlD (ORCPT ); Mon, 5 Jun 2017 11:41:03 -0400 Date: Mon, 5 Jun 2017 17:40:58 +0200 From: Ingo Molnar To: Ard Biesheuvel Cc: linux-efi@vger.kernel.org, Thomas Gleixner , "H . Peter Anvin" , Andy Lutomirski , linux-kernel@vger.kernel.org, Borislav Petkov , Andy Lutomirski , Matt Fleming Subject: Re: [PATCH 01/13] x86/efi: Clean up efi CR3 save/restore Message-ID: <20170605154058.r5b2eivguzhfrnnr@gmail.com> References: <20170602135207.21708-1-ard.biesheuvel@linaro.org> <20170602135207.21708-2-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170602135207.21708-2-ard.biesheuvel@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Ard Biesheuvel wrote: > From: Andy Lutomirski > > efi_call_phys_prolog() used to return a "pgd_t *" that meant one of > three different things depending on kernel and system configuration. > Clean it up so it uses a union and is more explicit about what's > going on. > > Signed-off-by: Andy Lutomirski > Cc: Ard Biesheuvel > Cc: Borislav Petkov > Cc: Andy Lutomirski > Cc: Ingo Molnar > Signed-off-by: Matt Fleming > Signed-off-by: Ard Biesheuvel > --- > arch/x86/include/asm/efi.h | 17 +++++++++++++++-- > arch/x86/platform/efi/efi.c | 6 +++--- > arch/x86/platform/efi/efi_32.c | 12 ++++++------ > arch/x86/platform/efi/efi_64.c | 22 ++++++++++++---------- > 4 files changed, 36 insertions(+), 21 deletions(-) Hm, this patch does not apply cleanly to v4.12-rc4: Applying patch patches/x86efi_Clean_up_efi_CR3_saverestore-1.patch patching file arch/x86/include/asm/efi.h patching file arch/x86/platform/efi/efi.c patching file arch/x86/platform/efi/efi_32.c patching file arch/x86/platform/efi/efi_64.c Hunk #1 FAILED at 69. Hunk #2 FAILED at 86. Hunk #3 succeeded at 152 with fuzz 1 (offset 44 lines). Hunk #4 FAILED at 116. 3 out of 4 hunks FAILED -- rejects in file arch/x86/platform/efi/efi_64.c what tree is this against? Thanks, Ingo