[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157475521115.21853.448312899013638043.tip-bot2@tip-bot2>
Date: Tue, 26 Nov 2019 08:00:11 -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] efi/capsule-loader: Explicitly include linux/io.h
for page_to_phys()
The following commit has been merged into the core/headers branch of tip:
Commit-ID: 53db61e1d344adda56a2a9dc8ae4fc099df0f95a
Gitweb: https://git.kernel.org/tip/53db61e1d344adda56a2a9dc8ae4fc099df0f95a
Author: Sean Christopherson <sean.j.christopherson@...el.com>
AuthorDate: Mon, 18 Nov 2019 16:21:15 -08:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Tue, 19 Nov 2019 17:50:26 +01:00
efi/capsule-loader: Explicitly include linux/io.h for page_to_phys()
Through a labyrinthian sequence of includes, usage of page_to_phys() is
dependent on the include of asm/io.h in x86's asm/realmode.h, which is
included in x86's asm/acpi.h and thus by linux/acpi.h. Explicitly
include linux/io.h to break the dependency on realmode.h so that a
future patch can remove the realmode.h include from acpi.h without
breaking the build.
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-7-sean.j.christopherson@intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
drivers/firmware/efi/capsule-loader.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c
index b139513..d3067cb 100644
--- a/drivers/firmware/efi/capsule-loader.c
+++ b/drivers/firmware/efi/capsule-loader.c
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/miscdevice.h>
#include <linux/highmem.h>
+#include <linux/io.h>
#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/efi.h>
Powered by blists - more mailing lists