| Message ID | 20191119002121.4107-10-sean.j.christopherson@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | treewide: break dependencies on x86's RM header | expand |
On Mon, Nov 18, 2019 at 04:21:18PM -0800, Sean Christopherson wrote: > 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. Acked-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/intel/skylake/skl-sst-cldma.c b/sound/soc/intel/skylake/skl-sst-cldma.c index 5a2c35f58fda..36f697c61074 100644 --- a/sound/soc/intel/skylake/skl-sst-cldma.c +++ b/sound/soc/intel/skylake/skl-sst-cldma.c @@ -8,6 +8,7 @@ */ #include <linux/device.h> +#include <linux/io.h> #include <linux/mm.h> #include <linux/delay.h> #include "../common/sst-dsp.h"
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. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- sound/soc/intel/skylake/skl-sst-cldma.c | 1 + 1 file changed, 1 insertion(+)