| Message ID | 20191119120655.GA31444@gmail.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
| Series | x86/platform/intel/quark: Explicitly include linux/io.h for virt_to_phys() | expand |
On Tue, Nov 19, 2019 at 2:07 PM Ingo Molnar <mingo@kernel.org> wrote: > > > * Ingo Molnar <mingo@kernel.org> wrote: > > > I've applied them to tip:WIP.core/headers as a work-in-progress tree, > > and I'm testing them on randconfigs to make sure there's no broken > > dependencies. I'll wait for the ACPI acks. > > One more fix was needed, for the intel-quark driver that is only built on > 32-bit configs: > > ==================> > From: Ingo Molnar <mingo@kernel.org> > Date: Tue, 19 Nov 2019 12:51:56 +0100 > Subject: [PATCH] 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." > LGTM, 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 6dd25dc5f027..e9d97d52475e 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> A nit: perhaps put it after imr.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 42f879b75f9b..4307830e1b6f 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> >
diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c index 6dd25dc5f027..e9d97d52475e 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 42f879b75f9b..4307830e1b6f 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>