aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.14
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-04-16 00:00:49 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2018-04-16 00:22:57 +0300
commitec1d7b94616c392c28b8a51f1aa0c481cc6d92c8 (patch)
treef25b8ee10186d5d2677d9ad48108ae3768e3914f /target/linux/brcm47xx/patches-4.14
parent03774d28e1c12f24857cdb44a110df593cec42a6 (diff)
downloadupstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.gz
upstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.bz2
upstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.zip
kernel: bump 4.14 to 4.14.34
Refresh patches. Update patches that no longer apply: - backport/313-netfilter-remove-defensive-check-on-malformed-packet.patch - pending/642-net-8021q-support-hardware-flow-table-offload.patch Compile-tested: x86/64. Runtime-tested: x86/64. Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.14')
-rw-r--r--target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch6
-rw-r--r--target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch2
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch
index 1b776fd078..32df8009ea 100644
--- a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch
@@ -63,7 +63,7 @@
cache_op(Hit_Invalidate_D, addr);
__dflush_epilogue
}
-@@ -205,6 +240,7 @@ static inline void protected_flush_icach
+@@ -205,6 +240,7 @@ static inline int protected_flush_icache
#ifdef CONFIG_EVA
return protected_cachee_op(Hit_Invalidate_I, addr);
#else
@@ -71,7 +71,7 @@
return protected_cache_op(Hit_Invalidate_I, addr);
#endif
}
-@@ -218,6 +254,7 @@ static inline void protected_flush_icach
+@@ -218,6 +254,7 @@ static inline int protected_flush_icache
*/
static inline int protected_writeback_dcache_line(unsigned long addr)
{
@@ -457,7 +457,7 @@
/*
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
-@@ -971,6 +971,9 @@ build_get_pgde32(u32 **p, unsigned int t
+@@ -971,6 +971,9 @@ void build_get_pgde32(u32 **p, unsigned
uasm_i_srl(p, ptr, ptr, SMP_CPUID_PTRSHIFT);
uasm_i_addu(p, ptr, tmp, ptr);
#else
diff --git a/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch
index 7e4ae20704..df9d434c9f 100644
--- a/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch
@@ -8,7 +8,7 @@
/*
* Some really old flashes (like AT45DB*) had smaller erasesize-s, but
-@@ -269,12 +270,23 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -283,12 +284,23 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0] == NVRAM_HEADER) {
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
master->size - blocksize, 0);