[tip: core/headers] x86/efi: Explicitly include realmode.h to handle RM trampoline quirk

From: tip-bot2 for Sean Christopherson
Date: Sun Jan 19 2020 - 05:40:59 EST


The following commit has been merged into the core/headers branch of tip:

Commit-ID: e71b6f0b68de3296839a311355c5f590ac3446e5
Gitweb: https://git.kernel.org/tip/e71b6f0b68de3296839a311355c5f590ac3446e5
Author: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
AuthorDate: Tue, 26 Nov 2019 08:54:06 -08:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Tue, 10 Dec 2019 10:15:47 +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>
Link: https://lkml.kernel.org/r/20191126165417.22423-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 7675cf7..4de2446 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