aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-22 21:54:26 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-23 13:23:22 +0200
commita5c62c933b689fd41e8c5ee355a5cbd1c694eaa5 (patch)
treeb8eaded981c908685b27300f3c04606ceb46927a /target
parentac3b5f00e17de2c7791748f6fa434eb93ee3b66e (diff)
downloadupstream-a5c62c933b689fd41e8c5ee355a5cbd1c694eaa5.tar.gz
upstream-a5c62c933b689fd41e8c5ee355a5cbd1c694eaa5.tar.bz2
upstream-a5c62c933b689fd41e8c5ee355a5cbd1c694eaa5.zip
kernel: bump 4.9 to 4.9.170
Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch4
-rw-r--r--target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch8
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch
index 4937e11782..ca89f87594 100644
--- a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch
+++ b/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch
@@ -38,7 +38,7 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
;----------------------------------------------------------------
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
-@@ -436,7 +436,7 @@ ignore_uboot_args:
+@@ -444,7 +444,7 @@ ignore_uboot_args:
#endif
if (use_embedded_dtb) {
@@ -47,7 +47,7 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
if (!machine_desc)
panic("Embedded DT invalid\n");
}
-@@ -452,6 +452,8 @@ ignore_uboot_args:
+@@ -460,6 +460,8 @@ ignore_uboot_args:
}
}
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 4c228b333a..11d5c7b561 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
@@ -995,7 +995,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
};
struct dmar_atsr_unit {
-@@ -4267,27 +4268,40 @@ static inline void init_iommu_pm_ops(voi
+@@ -4270,27 +4271,40 @@ static inline void init_iommu_pm_ops(voi
int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg)
{
struct acpi_dmar_reserved_memory *rmrr;
@@ -1041,7 +1041,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
}
static struct dmar_atsr_unit *dmar_find_atsr(struct acpi_dmar_atsr *atsr)
-@@ -4501,6 +4515,7 @@ static void intel_iommu_free_dmars(void)
+@@ -4504,6 +4518,7 @@ static void intel_iommu_free_dmars(void)
list_for_each_entry_safe(rmrru, rmrr_n, &dmar_rmrr_units, list) {
list_del(&rmrru->list);
dmar_free_dev_scope(&rmrru->devices, &rmrru->devices_cnt);
@@ -1049,7 +1049,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
kfree(rmrru);
}
-@@ -5236,6 +5251,45 @@ static void intel_iommu_remove_device(st
+@@ -5239,6 +5254,45 @@ static void intel_iommu_remove_device(st
iommu_device_unlink(iommu->iommu_dev, dev);
}
@@ -1095,7 +1095,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
#ifdef CONFIG_INTEL_IOMMU_SVM
#define MAX_NR_PASID_BITS (20)
static inline unsigned long intel_iommu_get_pts(struct intel_iommu *iommu)
-@@ -5366,19 +5420,21 @@ struct intel_iommu *intel_svm_device_to_
+@@ -5369,19 +5423,21 @@ struct intel_iommu *intel_svm_device_to_
#endif /* CONFIG_INTEL_IOMMU_SVM */
static const struct iommu_ops intel_iommu_ops = {