From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 14 Oct 2015 14:05:40 +0000 (+0200)
Subject: Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi... 
X-Git-Tag: v4.4-rc1~159^2~3
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=790a2ee2427852cff50993c98f15ed88511e9af0

Merge tag 'efi-next' of git://git./linux/kernel/git/mfleming/efi into core/efi

Pull v4.4 EFI updates from Matt Fleming:

  - Make the EFI System Resource Table (ESRT) driver explicitly
    non-modular by ripping out the module_* code since Kconfig doesn't
    allow it to be built as a module anyway. (Paul Gortmaker)

  - Make the x86 efi=debug kernel parameter, which enables EFI debug
    code and output, generic and usable by arm64. (Leif Lindholm)

  - Add support to the x86 EFI boot stub for 64-bit Graphics Output
    Protocol frame buffer addresses. (Matt Fleming)

  - Detect when the UEFI v2.5 EFI_PROPERTIES_TABLE feature is enabled
    in the firmware and set an efi.flags bit so the kernel knows when
    it can apply more strict runtime mapping attributes - Ard Biesheuvel

  - Auto-load the efi-pstore module on EFI systems, just like we
    currently do for the efivars module. (Ben Hutchings)

  - Add "efi_fake_mem" kernel parameter which allows the system's EFI
    memory map to be updated with additional attributes for specific
    memory ranges. This is useful for testing the kernel code that handles
    the EFI_MEMORY_MORE_RELIABLE memmap bit even if your firmware
    doesn't include support. (Taku Izumi)

Note: there is a semantic conflict between the following two commits:

  8a53554e12e9 ("x86/efi: Fix multiple GOP device support")
  ae2ee627dc87 ("efifb: Add support for 64-bit frame buffer addresses")

I fixed up the interaction in the merge commit, changing the type of
current_fb_base from u32 to u64.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

790a2ee2427852cff50993c98f15ed88511e9af0
diff --cc arch/x86/boot/compressed/eboot.c
index db51c1f27446,43473bb86ac0..583d539a4197
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@@ -667,7 -668,6 +668,7 @@@ setup_gop32(struct screen_info *si, efi
  		bool conout_found = false;
  		void *dummy = NULL;
  		u32 h = handles[i];
- 		u32 current_fb_base;
++		u64 current_fb_base;
  
  		status = efi_call_early(handle_protocol, h,
  					proto, (void **)&gop32);
@@@ -772,7 -779,6 +781,7 @@@ setup_gop64(struct screen_info *si, efi
  		bool conout_found = false;
  		void *dummy = NULL;
  		u64 h = handles[i];
- 		u32 current_fb_base;
++		u64 current_fb_base;
  
  		status = efi_call_early(handle_protocol, h,
  					proto, (void **)&gop64);