diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-06-26 14:45:12 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-06-26 18:20:37 +0200 |
| commit | 84d489f64f3b382d5544e342f66d8806e94e85d3 (patch) | |
| tree | dca318969c99733fc177e8564ccad33beb4d2c58 /target/linux/brcm47xx/patches-4.4 | |
| parent | 3bf35126733a4b4073c1d3388e226c2a8f79d65b (diff) | |
| download | upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.tar.gz upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.tar.bz2 upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.zip | |
kernel: update to version 4.4.14
Changelog: https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.14
Some manual changes to target/linux/generic/patches-4.4/610-
netfilter_match_bypass_default_checks.patch were needed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.4')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.4/159-cpu_fixes.patch | 16 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/patches-4.4/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.4/159-cpu_fixes.patch index 50df04f1e0..1a3e0a60f9 100644 --- a/target/linux/brcm47xx/patches-4.4/159-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-4.4/159-cpu_fixes.patch @@ -276,9 +276,9 @@ +int bcm4710 = 0; + /* - * Special Variant of smp_call_function for use by cache functions: + * Bits describing what cache ops an IPI callback function may perform. * -@@ -157,6 +160,9 @@ static void r4k_blast_dcache_user_page_s +@@ -202,6 +205,9 @@ static void r4k_blast_dcache_user_page_s { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -288,7 +288,7 @@ if (dc_lsize == 0) r4k_blast_dcache_user_page = (void *)cache_noop; else if (dc_lsize == 16) -@@ -175,6 +181,9 @@ static void r4k_blast_dcache_page_indexe +@@ -220,6 +226,9 @@ static void r4k_blast_dcache_page_indexe { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -298,7 +298,7 @@ if (dc_lsize == 0) r4k_blast_dcache_page_indexed = (void *)cache_noop; else if (dc_lsize == 16) -@@ -194,6 +203,9 @@ static void r4k_blast_dcache_setup(void) +@@ -239,6 +248,9 @@ static void r4k_blast_dcache_setup(void) { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -308,7 +308,7 @@ if (dc_lsize == 0) r4k_blast_dcache = (void *)cache_noop; else if (dc_lsize == 16) -@@ -793,6 +805,8 @@ static void local_r4k_flush_cache_sigtra +@@ -880,6 +892,8 @@ static void local_r4k_flush_cache_sigtra unsigned long addr = (unsigned long) arg; R4600_HIT_CACHEOP_WAR_IMPL; @@ -317,7 +317,7 @@ if (dc_lsize) protected_writeback_dcache_line(addr & ~(dc_lsize - 1)); if (!cpu_icache_snoops_remote_store && scache_size) -@@ -1602,6 +1616,17 @@ static void coherency_setup(void) +@@ -1704,6 +1718,17 @@ static void coherency_setup(void) * silly idea of putting something else there ... */ switch (current_cpu_type()) { @@ -335,7 +335,7 @@ case CPU_R4000PC: case CPU_R4000SC: case CPU_R4000MC: -@@ -1648,6 +1673,15 @@ void r4k_cache_init(void) +@@ -1750,6 +1775,15 @@ void r4k_cache_init(void) extern void build_copy_page(void); struct cpuinfo_mips *c = ¤t_cpu_data; @@ -351,7 +351,7 @@ probe_pcache(); setup_scache(); -@@ -1717,7 +1751,15 @@ void r4k_cache_init(void) +@@ -1819,7 +1853,15 @@ void r4k_cache_init(void) */ local_r4k___flush_cache_all(NULL); diff --git a/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch index 3d65fdfd62..af8c27a674 100644 --- a/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch +++ b/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch @@ -29,7 +29,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485 #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -600,7 +600,7 @@ static inline void local_r4k_flush_cache +@@ -645,7 +645,7 @@ static inline void local_r4k_flush_cache */ map_coherent = (cpu_has_dc_aliases && page_mapped(page) && !Page_dcache_dirty(page)); @@ -38,7 +38,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485 vaddr = kmap_coherent(page, addr); else vaddr = kmap_atomic(page); -@@ -625,7 +625,7 @@ static inline void local_r4k_flush_cache +@@ -670,7 +670,7 @@ static inline void local_r4k_flush_cache } if (vaddr) { |