On Fri, Jan 11, 2019 at 12:33:08PM +0100, Joerg Roedel wrote: > On Mon, Jan 07, 2019 at 04:42:07PM +0000, Lorenzo Pieralisi wrote: > > From: Qian Cai <cai@xxxxxx> > > > > Commit 8097e53eaba2 ("ACPI/IORT: Use helper functions to access > > dev->iommu_fwspec") changed by mistake the iort_fwspec_iommu_ops() stub > > definition (compiled in when CONFIG_IOMMU_API=n), that caused the > > following compilation failure: > > > > drivers/acpi/arm64/iort.c:880:1: error: expected identifier or > > '(' before '{' token > > { return NULL; } > > ^ > > drivers/acpi/arm64/iort.c:879:39: warning: 'iort_fwspec_iommu_ops' > > used but never defined > > static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev); > > ^~~~~~~~~~~~~~~~~~~~~ > > > > Fix it. > > > > Fixes: 8097e53eaba2 ("ACPI/IORT: Use helper functions to access dev->iommu_fwspec") > > Signed-off-by: Qian Cai <cai@xxxxxx> > > [lorenzo.pieralisi@xxxxxxx: updated tags and log] > > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx> > > Acked-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx> > > Cc: Will Deacon <will.deacon@xxxxxxx> > > Cc: Sudeep Holla <sudeep.holla@xxxxxxx> > > Cc: Catalin Marinas <catalin.marinas@xxxxxxx> > > Cc: Joerg Roedel <jroedel@xxxxxxx> > > Applied to iommu/fixes, thanks. I've already got this one in arm64 for-next/fixes (should be in linux-next already). Would you prefer me to drop it (which would mean a rebase :()? I was planning to send a pull later today, since I have some other fixes queued as well. Will