diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 16:35:18 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 16:35:18 -0300 |
| commit | 28f04363b04142c45f8a29d0c32e21b060975e90 (patch) | |
| tree | 8578cfe035db9bd4b78a0c504512c5e7f89a96cb /include/linux/iova.h | |
| parent | 7540d075c97713a4366a00b5c928261436b93d2d (diff) | |
| parent | bd8a595958a5b02e58cdd6fed82d4ebc77b1988a (diff) | |
Merge tag 'v5.15.75' into 5.15-2.1.x-imx
This is the 5.15.75 stable release
Conflicts:
arch/arm/boot/dts/imx6dl.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/imx6sl.dtsi
arch/arm/boot/dts/imx6sll.dtsi
arch/arm/boot/dts/imx6sx.dtsi
arch/arm/boot/dts/imx7d-sdb.dts
drivers/char/hw_random/imx-rngc.c
drivers/dma/mxs-dma.c
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
drivers/tty/serial/fsl_lpuart.c
drivers/usb/host/xhci.h
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'include/linux/iova.h')
| -rw-r--r-- | include/linux/iova.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iova.h b/include/linux/iova.h index 71d8a2de6635..6b6cc104e300 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -133,7 +133,7 @@ static inline unsigned long iova_pfn(struct iova_domain *iovad, dma_addr_t iova) return iova >> iova_shift(iovad); } -#if IS_ENABLED(CONFIG_IOMMU_IOVA) +#if IS_REACHABLE(CONFIG_IOMMU_IOVA) int iova_cache_get(void); void iova_cache_put(void); |