* Ard Biesheuvel <ard.biesheu...@linaro.org> wrote:

> From: Sai Praneeth <sai.praneeth.prak...@intel.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.prak...@intel.com>
> Cc: "Lee, Chun-Yi" <j...@suse.com>
> Cc: Borislav Petkov <b...@alien8.de>
> Cc: Tony Luck <tony.l...@intel.com>
> Cc: Andy Lutomirski <l...@kernel.org>
> Cc: Michael S. Tsirkin <m...@redhat.com>
> Cc: Bhupesh Sharma <bhsha...@redhat.com>
> Cc: Ricardo Neri <ricardo.n...@intel.com>
> Cc: Ravi Shankar <ravi.v.shan...@intel.com>
> Tested-by: Bhupesh Sharma <bhsha...@redhat.com>
> Reviewed-by: Matt Fleming <m...@codeblueprint.co.uk>
> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.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
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to