diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-22 11:51:07 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-22 15:29:01 +0200 |
| commit | 4dc42ef40eb51074d55c701c86ae5b49599c67b1 (patch) | |
| tree | b7feae1979f4a7c115d22552f1848698c615ee25 /target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch | |
| parent | 47f68ca58615fa71d7905130fb28d3ffe51effa2 (diff) | |
| download | upstream-4dc42ef40eb51074d55c701c86ae5b49599c67b1.tar.gz upstream-4dc42ef40eb51074d55c701c86ae5b49599c67b1.tar.bz2 upstream-4dc42ef40eb51074d55c701c86ae5b49599c67b1.zip | |
kernel: bump 4.9 to 4.9.135
Refreshed all patches.
Fixes:
- CVE-2018-10883
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch')
| -rw-r--r-- | target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch b/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch index e31c7db3e8..b072ccca11 100644 --- a/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch @@ -25,7 +25,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c -@@ -373,6 +373,8 @@ static struct iommu_group *acpihid_devic +@@ -379,6 +379,8 @@ static struct iommu_group *acpihid_devic if (!entry->group) entry->group = generic_device_group(dev); @@ -34,7 +34,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> return entry->group; } -@@ -3160,9 +3162,10 @@ static bool amd_iommu_capable(enum iommu +@@ -3166,9 +3168,10 @@ static bool amd_iommu_capable(enum iommu return false; } @@ -47,7 +47,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> struct unity_map_entry *entry; int devid; -@@ -3171,41 +3174,56 @@ static void amd_iommu_get_dm_regions(str +@@ -3177,41 +3180,56 @@ static void amd_iommu_get_dm_regions(str return; list_for_each_entry(entry, &amd_iommu_unity_map, list) { @@ -118,7 +118,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { struct dma_ops_domain *dma_dom = to_dma_ops_domain(to_pdomain(domain)); unsigned long start, end; -@@ -3229,9 +3247,9 @@ static const struct iommu_ops amd_iommu_ +@@ -3235,9 +3253,9 @@ static const struct iommu_ops amd_iommu_ .add_device = amd_iommu_add_device, .remove_device = amd_iommu_remove_device, .device_group = amd_iommu_device_group, |