aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2018-12-23 16:16:17 +0000
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2018-12-24 15:06:33 +0000
commit5b3afca7576887be509eb21950009851676a1acb (patch)
treee1a756a64eb949eaa7e4d657b9322ebc188a1d21 /target/linux/cns3xxx
parent9a37c95431b5401c309b7731920daa964842bdee (diff)
downloadupstream-5b3afca7576887be509eb21950009851676a1acb.tar.gz
upstream-5b3afca7576887be509eb21950009851676a1acb.tar.bz2
upstream-5b3afca7576887be509eb21950009851676a1acb.zip
kernel: bump 4.14 to 4.14.90
Refresh all patches Remove upstream patch: backport-4.14/424-v4.20-net-dsa-fix-88e6060-roaming.patch Minor tweak to generic/hack-4.14/902-debloat_proc.patch to cleanly apply after upstream changes. Tested-on: ath79 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/cns3xxx')
-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)