The following commit has been merged into the core/headers branch of tip: Commit-ID: 950e3ce5372c474066ccfc66f424be6bc2828c99 Gitweb: https://git.kernel.org/tip/950e3ce5372c474066ccfc66f424be6bc2828c99 Author: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> AuthorDate: Mon, 18 Nov 2019 16:21:10 -08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 19 Nov 2019 17:50:26 +01:00 x86/efi: Explicitly include realmode.h to handle RM trampoline quirk Explicitly include asm/realmode.h, which is needed to handle a real mode trampoline quirk in efi_free_boot_services(), instead of picking it up by way of linux/acpi.h. acpi.h will soon stop including realmode.h so that changing realmode.h doesn't require a full kernel rebuild. Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20191119002121.4107-2-sean.j.christopherson@xxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/x86/platform/efi/quirks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 3b9fd67..f9ef5c5 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -16,6 +16,7 @@ #include <asm/efi.h> #include <asm/uv/uv.h> #include <asm/cpu_device_id.h> +#include <asm/realmode.h> #include <asm/reboot.h> #define EFI_MIN_RESERVE 5120
|