aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-07 11:12:09 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-08 13:13:16 +0100
commit367ccf7a2d4ff7bec492fd7802b00ac38cbcd707 (patch)
tree4a8ab9c641ad7a67eaadb33bf2a7ed4bfac32421 /target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch
parentb9dcf2de5f3d42c4b5b1cbaf607e0265a518dc63 (diff)
downloadupstream-367ccf7a2d4ff7bec492fd7802b00ac38cbcd707.tar.gz
upstream-367ccf7a2d4ff7bec492fd7802b00ac38cbcd707.tar.bz2
upstream-367ccf7a2d4ff7bec492fd7802b00ac38cbcd707.zip
kernel: bump 4.14 to 4.14.91
Refreshed all patches. Altered patches: - 902-debloat_proc.patch Removed upstreamed: - 500-ubifs-Handle-re-linking-of-inodes-correctly-while-re.patch Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch')
-rw-r--r--target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch b/target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch
index 7a3a8e4c25..b5f0350571 100644
--- a/target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch
+++ b/target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch
@@ -1,7 +1,7 @@
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -86,6 +86,79 @@ static void __iomem *cns3xxx_pci_map_bus
- return base + (where & 0xffc) + (devfn << 12);
+ return base + where + (devfn << 12);
}
+static inline int check_master_abort(struct pci_bus *bus, unsigned int devfn, int where)