[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157943044777.396.1969786889590406766.tip-bot2@tip-bot2>
Date: Sun, 19 Jan 2020 10:40:47 -0000
From: "tip-bot2 for Sean Christopherson" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Sean Christopherson <sean.j.christopherson@...el.com>,
Ingo Molnar <mingo@...nel.org>, x86 <x86@...nel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [tip: core/headers] x86/efi: Explicitly include realmode.h to handle
RM trampoline quirk
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@...el.com>
AuthorDate: Tue, 26 Nov 2019 08:54:06 -08:00
Committer: Ingo Molnar <mingo@...nel.org>
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@...el.com>
Link: https://lkml.kernel.org/r/20191126165417.22423-2-sean.j.christopherson@intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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
Powered by blists - more mailing lists