diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-25 10:28:29 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-25 10:28:29 +0000 |
| commit | e8e4b6eed8da155967519183652a74fa43d51abf (patch) | |
| tree | 01e6b6ece748f3722cfba806f7b0c379976ae4bc /target | |
| parent | 68fef14e46bff07785ba84990cfcbfbdb33047a2 (diff) | |
| download | mtk-20170518-e8e4b6eed8da155967519183652a74fa43d51abf.zip mtk-20170518-e8e4b6eed8da155967519183652a74fa43d51abf.tar.gz mtk-20170518-e8e4b6eed8da155967519183652a74fa43d51abf.tar.bz2 | |
kernel: fix a small bug in the MIPS highmem fix
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48482
Diffstat (limited to 'target')
4 files changed, 20 insertions, 8 deletions
diff --git a/target/linux/generic/patches-4.3/101-MIPS-fix-cache-flushing-for-highmem-pages.patch b/target/linux/generic/patches-4.3/101-MIPS-fix-cache-flushing-for-highmem-pages.patch index d7220af..6a6c581 100644 --- a/target/linux/generic/patches-4.3/101-MIPS-fix-cache-flushing-for-highmem-pages.patch +++ b/target/linux/generic/patches-4.3/101-MIPS-fix-cache-flushing-for-highmem-pages.patch @@ -79,17 +79,23 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> addr = (unsigned long) page_address(page); flush_data_cache_page(addr); -@@ -142,7 +161,12 @@ void __update_cache(struct vm_area_struc +@@ -142,12 +161,17 @@ void __update_cache(struct vm_area_struc if (unlikely(!pfn_valid(pfn))) return; page = pfn_to_page(pfn); - if (page_mapping(page) && Page_dcache_dirty(page)) { -+ if (!Page_dcache_dirty(page)) ++ if (!Page_dcache_dirty(page) || !page_mapping(page)) + return; + + if (PageHighMem(page)) { + flush_highmem_page(page); -+ } else if (page_mapping(page)) { ++ } else { addr = (unsigned long) page_address(page); if (exec || pages_do_alias(addr, address & PAGE_MASK)) flush_data_cache_page(addr); +- ClearPageDcacheDirty(page); + } ++ ClearPageDcacheDirty(page); + } + + unsigned long _page_cachable_default; diff --git a/target/linux/generic/patches-4.3/309-mips_fuse_workaround.patch b/target/linux/generic/patches-4.3/309-mips_fuse_workaround.patch index 811dd6b..14d7962 100644 --- a/target/linux/generic/patches-4.3/309-mips_fuse_workaround.patch +++ b/target/linux/generic/patches-4.3/309-mips_fuse_workaround.patch @@ -1,6 +1,6 @@ --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -38,6 +38,7 @@ void (*__flush_cache_vunmap)(void); +@@ -39,6 +39,7 @@ void (*__flush_cache_vunmap)(void); void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size); EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range); diff --git a/target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch b/target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch index d7220af..6a6c581 100644 --- a/target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch +++ b/target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch @@ -79,17 +79,23 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> addr = (unsigned long) page_address(page); flush_data_cache_page(addr); -@@ -142,7 +161,12 @@ void __update_cache(struct vm_area_struc +@@ -142,12 +161,17 @@ void __update_cache(struct vm_area_struc if (unlikely(!pfn_valid(pfn))) return; page = pfn_to_page(pfn); - if (page_mapping(page) && Page_dcache_dirty(page)) { -+ if (!Page_dcache_dirty(page)) ++ if (!Page_dcache_dirty(page) || !page_mapping(page)) + return; + + if (PageHighMem(page)) { + flush_highmem_page(page); -+ } else if (page_mapping(page)) { ++ } else { addr = (unsigned long) page_address(page); if (exec || pages_do_alias(addr, address & PAGE_MASK)) flush_data_cache_page(addr); +- ClearPageDcacheDirty(page); + } ++ ClearPageDcacheDirty(page); + } + + unsigned long _page_cachable_default; diff --git a/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch b/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch index 811dd6b..14d7962 100644 --- a/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch +++ b/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch @@ -1,6 +1,6 @@ --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -38,6 +38,7 @@ void (*__flush_cache_vunmap)(void); +@@ -39,6 +39,7 @@ void (*__flush_cache_vunmap)(void); void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size); EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range); |