diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
| commit | 6be2305da83471c442dab83366c25be4dfb38793 (patch) | |
| tree | 30cfe6f3fc964dca1936646468c87367b509e929 /target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch | |
| parent | 8e69c9f7ef2e1ca40b33a4a33c76b460c1f62861 (diff) | |
| download | upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.gz upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.bz2 upstream-6be2305da83471c442dab83366c25be4dfb38793.zip | |
kernel: update 4.1 to 4.1.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46598
Diffstat (limited to 'target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch index a78bfe85ff..2df8f0481b 100644 --- a/target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch +++ b/target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch @@ -21,7 +21,7 @@ #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -592,7 +592,7 @@ static inline void local_r4k_flush_cache +@@ -600,7 +600,7 @@ static inline void local_r4k_flush_cache */ map_coherent = (cpu_has_dc_aliases && page_mapped(page) && !Page_dcache_dirty(page)); @@ -30,7 +30,7 @@ vaddr = kmap_coherent(page, addr); else vaddr = kmap_atomic(page); -@@ -617,7 +617,7 @@ static inline void local_r4k_flush_cache +@@ -625,7 +625,7 @@ static inline void local_r4k_flush_cache } if (vaddr) { |