| Message ID | 2feaccf3-003b-f2ce-f101-da23f8c387c8@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86: don't include {amd-, }iommu.h from fixmap.h | expand |
On 26/07/2019 14:34, Jan Beulich wrote: > The #include was added by 0700c962ac ("Add AMD IOMMU support into > hypervisor") and I then didn't drop it again in d7f913b8de ("AMD IOMMU: > use ioremap()"); similarly for xen/iommu.h in 99321e0e6c ("VT-d: use > ioremap()"). Avoid needlessly re-building unrelated files when only > IOMMU definitions have changed. > > Two #include-s of xen/init.h turn out necessary as replacement. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/drivers/acpi/apei/apei-io.c +++ b/xen/drivers/acpi/apei/apei-io.c @@ -21,6 +21,7 @@ #include <xen/kernel.h> #include <xen/errno.h> #include <xen/delay.h> +#include <xen/init.h> #include <xen/string.h> #include <xen/xmalloc.h> #include <xen/types.h> --- a/xen/drivers/acpi/apei/erst.c +++ b/xen/drivers/acpi/apei/erst.c @@ -28,6 +28,7 @@ #include <xen/kernel.h> #include <xen/errno.h> #include <xen/delay.h> +#include <xen/init.h> #include <xen/string.h> #include <xen/types.h> #include <xen/spinlock.h> --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -21,9 +21,7 @@ #include <xen/acpi.h> #include <xen/pfn.h> #include <xen/kexec.h> -#include <xen/iommu.h> #include <asm/apicdef.h> -#include <asm/amd-iommu.h> #include <asm/msi.h> #include <acpi/apei.h>
The #include was added by 0700c962ac ("Add AMD IOMMU support into hypervisor") and I then didn't drop it again in d7f913b8de ("AMD IOMMU: use ioremap()"); similarly for xen/iommu.h in 99321e0e6c ("VT-d: use ioremap()"). Avoid needlessly re-building unrelated files when only IOMMU definitions have changed. Two #include-s of xen/init.h turn out necessary as replacement. Signed-off-by: Jan Beulich <jbeulich@suse.com>