[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157943044751.396.1039007415959241549.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/boot: Explicitly include realmode.h to handle
RM reservations
The following commit has been merged into the core/headers branch of tip:
Commit-ID: ca947b72e1dec3a000190733f7e0be38fe73eaae
Gitweb: https://git.kernel.org/tip/ca947b72e1dec3a000190733f7e0be38fe73eaae
Author: Sean Christopherson <sean.j.christopherson@...el.com>
AuthorDate: Tue, 26 Nov 2019 08:54:07 -08:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Tue, 10 Dec 2019 10:15:47 +01:00
x86/boot: Explicitly include realmode.h to handle RM reservations
Explicitly include asm/realmode.h, which provides reserve_real_mode(),
instead of picking it up by an indirect include of asm/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-3-sean.j.christopherson@intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/setup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index b5ac993..a584983 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -35,6 +35,7 @@
#include <asm/kaslr.h>
#include <asm/mce.h>
#include <asm/mtrr.h>
+#include <asm/realmode.h>
#include <asm/olpc_ofw.h>
#include <asm/pci-direct.h>
#include <asm/prom.h>
Powered by blists - more mailing lists