diff options
author | Stijn Segers <foss@volatilesystems.org> | 2018-08-04 18:08:25 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2018-08-06 07:30:32 +0200 |
commit | 9e1530b2a35e051664ed243efd1eac942883494a (patch) | |
tree | 8490f4a288ad1637a7e2af63a7864636ea108339 /target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch | |
parent | 8be3af93b433bf79a8fee4d41d84a796b5708121 (diff) | |
download | upstream-9e1530b2a35e051664ed243efd1eac942883494a.tar.gz upstream-9e1530b2a35e051664ed243efd1eac942883494a.tar.bz2 upstream-9e1530b2a35e051664ed243efd1eac942883494a.zip |
kernel: bump 4.9 to 4.9.117 for 18.06
* Refreshed patches.
* Removed patches:
- target/linux/ar71xx/patches-4.9/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch superseded by upstream
- target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch superseded by upstream
- target/linux/brcm63xx/patches-4.9/001-4.11-01-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch accepted upstream
- target/linux/brcm63xx/patches-4.9/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch accepted upstream
- target/linux/brcm63xx/patches-4.9/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch accepted upstream
- target/linux/generic/pending-4.9/900-gen_stats-fix-netlink-stats-padding.patch
* New backported patch to address ext4 breakage, introduced in 4.9.112:
- backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch
Also add ARM64_SSBD symbol to ARM64 targets still running kernel 4.9
Thanks to Koen Vandeputte for pointing out the need to add the ARM64_SSBD symbol, and the ext4 patch.
Compile-tested on: ar71xx
Run-tested on: ar71xx
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
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 b9faa504b6..050092905c 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 @@ -1472,7 +1472,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> } --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h -@@ -27,6 +27,7 @@ int iommu_dma_init(void); +@@ -28,6 +28,7 @@ int iommu_dma_init(void); /* Domain management interface for IOMMU drivers */ int iommu_get_dma_cookie(struct iommu_domain *domain); @@ -1480,7 +1480,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> void iommu_put_dma_cookie(struct iommu_domain *domain); /* Setup call for arch DMA mapping code */ -@@ -66,6 +67,7 @@ int iommu_dma_mapping_error(struct devic +@@ -67,6 +68,7 @@ int iommu_dma_mapping_error(struct devic /* The DMA API isn't _quite_ the whole story, though... */ void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg); @@ -1488,7 +1488,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> #else -@@ -82,6 +84,11 @@ static inline int iommu_get_dma_cookie(s +@@ -83,6 +85,11 @@ static inline int iommu_get_dma_cookie(s return -ENODEV; } @@ -1500,7 +1500,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> static inline void iommu_put_dma_cookie(struct iommu_domain *domain) { } -@@ -90,6 +97,10 @@ static inline void iommu_dma_map_msi_msg +@@ -91,6 +98,10 @@ static inline void iommu_dma_map_msi_msg { } |