[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20180312090220.lmohpvj62v7l2qsc@gmail.com>
Date: Mon, 12 Mar 2018 10:02:20 +0100
From: Ingo Molnar <mingo@...nel.org>
To: Ard Biesheuvel <ard.biesheuvel@...aro.org>,
Andy Lutomirski <luto@...nel.org>
Cc: linux-efi@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
Sai Praneeth <sai.praneeth.prakhya@...el.com>,
linux-kernel@...r.kernel.org, "Lee, Chun-Yi" <jlee@...e.com>,
Borislav Petkov <bp@...en8.de>,
Tony Luck <tony.luck@...el.com>,
Andy Lutomirski <luto@...nel.org>,
"Michael S . Tsirkin" <mst@...hat.com>,
Bhupesh Sharma <bhsharma@...hat.com>,
Ricardo Neri <ricardo.neri@...el.com>,
Ravi Shankar <ravi.v.shankar@...el.com>
Subject: Re: [PATCH 2/5] x86/efi: Replace efi_pgd with efi_mm.pgd
* Ard Biesheuvel <ard.biesheuvel@...aro.org> wrote:
> From: Sai Praneeth <sai.praneeth.prakhya@...el.com>
>
> Since the previous patch added support for efi_mm, let's handle efi_pgd
> through efi_mm and remove global variable efi_pgd.
>
> Signed-off-by: Sai Praneeth Prakhya <sai.praneeth.prakhya@...el.com>
> Cc: "Lee, Chun-Yi" <jlee@...e.com>
> Cc: Borislav Petkov <bp@...en8.de>
> Cc: Tony Luck <tony.luck@...el.com>
> Cc: Andy Lutomirski <luto@...nel.org>
> Cc: Michael S. Tsirkin <mst@...hat.com>
> Cc: Bhupesh Sharma <bhsharma@...hat.com>
> Cc: Ricardo Neri <ricardo.neri@...el.com>
> Cc: Ravi Shankar <ravi.v.shankar@...el.com>
> Tested-by: Bhupesh Sharma <bhsharma@...hat.com>
> Reviewed-by: Matt Fleming <matt@...eblueprint.co.uk>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@...aro.org>
> ---
> arch/x86/platform/efi/efi_64.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
> index 0045efe9947b..8881e601c32d 100644
> --- a/arch/x86/platform/efi/efi_64.c
> +++ b/arch/x86/platform/efi/efi_64.c
> @@ -190,8 +190,6 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
> early_code_mapping_set_exec(0);
> }
>
> -static pgd_t *efi_pgd;
> -
Hm, so there's some interaction here with:
116fef640859: x86/mm/dump_pagetables: Add the EFI pagetable to the debugfs 'page_tables' directory
which is in tip:x86/mm.
Could you please resolve that conflict? I'll sort out the topic branches
afterwards.
Thanks,
Ingo
Powered by blists - more mailing lists