[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157475521202.21853.13566279692886386600.tip-bot2@tip-bot2>
Date: Tue, 26 Nov 2019 08:00:12 -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>,
Borislav Petkov <bp@...en8.de>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Peter Zijlstra <peterz@...radead.org>,
Thomas Gleixner <tglx@...utronix.de>,
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: db802ef3c91fad3b40a240f63d8e2fda23a1a9b1
Gitweb: https://git.kernel.org/tip/db802ef3c91fad3b40a240f63d8e2fda23a1a9b1
Author: Sean Christopherson <sean.j.christopherson@...el.com>
AuthorDate: Mon, 18 Nov 2019 16:21:11 -08:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Tue, 19 Nov 2019 17:50:26 +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>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: https://lkml.kernel.org/r/20191119002121.4107-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 a871381..38dfb61 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