diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-10-24 22:44:11 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-10-24 22:44:11 +0200 |
| commit | 96917bb3a377e1ed103fd5c420a95e5fb25ca104 (patch) | |
| tree | 59e0ef14e8707efba95d2f795742ba69a03bc8d0 /drivers/iommu/mtk_iommu.c | |
| parent | Merge branch 'ptp-ocxp-Oroli-ART-CARD' (diff) | |
| parent | Merge tag 'net-6.1-rc3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ne... (diff) | |
| download | linux-96917bb3a377e1ed103fd5c420a95e5fb25ca104.tar.xz linux-96917bb3a377e1ed103fd5c420a95e5fb25ca104.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/linux/net.h
a5ef058dc4d9 ("net: introduce and use custom sockopt socket flag")
e993ffe3da4b ("net: flag sockets supporting msghdr originated zerocopy")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/iommu/mtk_iommu.c')
| -rw-r--r-- | drivers/iommu/mtk_iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 5a4e00e4bbbc..2ab2ecfe01f8 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -917,7 +917,8 @@ static void mtk_iommu_get_resv_regions(struct device *dev, continue; region = iommu_alloc_resv_region(resv->iova_base, resv->size, - prot, IOMMU_RESV_RESERVED); + prot, IOMMU_RESV_RESERVED, + GFP_KERNEL); if (!region) return; |