]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys()
authorIngo Molnar <mingo@kernel.org>
Tue, 26 Nov 2019 08:00:09 +0000 (08:00 +0000)
committerIngo Molnar <mingo@kernel.org>
Tue, 10 Dec 2019 09:15:47 +0000 (10:15 +0100)
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
arch/x86/platform/intel-quark/imr_selftest.c

index 6dd25dc5f0279a420aa619662e82e7586ddb22b5..e9d97d52475e15136b1215aba3f95446b7080408 100644 (file)
@@ -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>
index 42f879b75f9b9d7536a659c6079ab880cd04daf9..4307830e1b6f027e8dd53c07c463c17aca7d9871 100644 (file)
@@ -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>