* [tip: core/headers] x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys()
@ 2019-11-26 8:00 tip-bot2 for Ingo Molnar
2020-01-19 10:40 ` tip-bot2 for Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2019-11-26 8:00 UTC (permalink / raw)
To: linux-tip-commits
Cc: Andy Shevchenko, linux-kernel, Sean Christopherson,
Borislav Petkov, Linus Torvalds, Peter Zijlstra, Thomas Gleixner,
Ingo Molnar, x86
The following commit has been merged into the core/headers branch of tip:
Commit-ID: 995462afd65e2f2af23bd6d518a36406c44666b8
Gitweb: https://git.kernel.org/tip/995462afd65e2f2af23bd6d518a36406c44666b8
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Tue, 19 Nov 2019 12:51:56 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 19 Nov 2019 17:52:13 +01:00
x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys()
Similarly to the previous patches by Sean Christopherson:
"Through a labyrinthian sequence of includes, usage of virt_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."
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: linux-kernel@vger.kernel.org
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/platform/intel-quark/imr.c | 2 ++
arch/x86/platform/intel-quark/imr_selftest.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c
index 6dd25dc..e9d97d5 100644
--- a/arch/x86/platform/intel-quark/imr.c
+++ b/arch/x86/platform/intel-quark/imr.c
@@ -29,6 +29,8 @@
#include <asm/cpu_device_id.h>
#include <asm/imr.h>
#include <asm/iosf_mbi.h>
+#include <asm/io.h>
+
#include <linux/debugfs.h>
#include <linux/init.h>
#include <linux/mm.h>
diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
index 42f879b..4307830 100644
--- a/arch/x86/platform/intel-quark/imr_selftest.c
+++ b/arch/x86/platform/intel-quark/imr_selftest.c
@@ -14,6 +14,8 @@
#include <asm-generic/sections.h>
#include <asm/cpu_device_id.h>
#include <asm/imr.h>
+#include <asm/io.h>
+
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/types.h>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip: core/headers] x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys()
2019-11-26 8:00 [tip: core/headers] x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys() tip-bot2 for Ingo Molnar
@ 2020-01-19 10:40 ` tip-bot2 for Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2020-01-19 10:40 UTC (permalink / raw)
To: linux-tip-commits
Cc: Andy Shevchenko, Sean Christopherson, Ingo Molnar, x86, LKML
The following commit has been merged into the core/headers branch of tip:
Commit-ID: f803e34d4a25e1cf43f89f21e05176ed19223dc1
Gitweb: https://git.kernel.org/tip/f803e34d4a25e1cf43f89f21e05176ed19223dc1
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Tue, 26 Nov 2019 08:00:09
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 10 Dec 2019 10:15:47 +01:00
x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys()
Similarly to the previous patches by Sean Christopherson:
"Through a labyrinthian sequence of includes, usage of virt_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."
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Link: https://lkml.kernel.org/r/157475520975.21853.16355518818746065226.tip-bot2@tip-bot2
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/platform/intel-quark/imr.c | 2 ++
arch/x86/platform/intel-quark/imr_selftest.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c
index 6dd25dc..e9d97d5 100644
--- a/arch/x86/platform/intel-quark/imr.c
+++ b/arch/x86/platform/intel-quark/imr.c
@@ -29,6 +29,8 @@
#include <asm/cpu_device_id.h>
#include <asm/imr.h>
#include <asm/iosf_mbi.h>
+#include <asm/io.h>
+
#include <linux/debugfs.h>
#include <linux/init.h>
#include <linux/mm.h>
diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
index 42f879b..4307830 100644
--- a/arch/x86/platform/intel-quark/imr_selftest.c
+++ b/arch/x86/platform/intel-quark/imr_selftest.c
@@ -14,6 +14,8 @@
#include <asm-generic/sections.h>
#include <asm/cpu_device_id.h>
#include <asm/imr.h>
+#include <asm/io.h>
+
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/types.h>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-19 10:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-26 8:00 [tip: core/headers] x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys() tip-bot2 for Ingo Molnar
2020-01-19 10:40 ` tip-bot2 for Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®