From 0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sun, 12 Jun 2016 11:49:46 +0200 Subject: kernel: update kernel 4.4 to version 4.4.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- ...MIPS-fix-cache-flushing-for-highmem-pages.patch | 78 ++-------------------- 1 file changed, 4 insertions(+), 74 deletions(-) (limited to 'target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch') 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 237f0e500c..e4ac2cd583 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 @@ -15,87 +15,17 @@ Signed-off-by: Felix Fietkau --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -78,18 +79,29 @@ SYSCALL_DEFINE3(cacheflush, unsigned lon - return 0; - } - -+static void -+flush_highmem_page(struct page *page) -+{ -+ void *addr = kmap_atomic(page); -+ flush_data_cache_page((unsigned long)addr); -+ kunmap_atomic(addr); -+} -+ - void __flush_dcache_page(struct page *page) - { - struct address_space *mapping = page_mapping(page); - unsigned long addr; - -- if (PageHighMem(page)) -- return; - if (mapping && !mapping_mapped(mapping)) { - SetPageDcacheDirty(page); - return; - } - -+ if (PageHighMem(page)) { -+ flush_highmem_page(page); -+ return; -+ } -+ - /* - * We could delay the flush for the !page_mapping case too. But that - * case is for exec env/arg pages and those are %99 certainly going to -@@ -105,6 +117,11 @@ void __flush_anon_page(struct page *page +@@ -111,6 +111,13 @@ void __flush_anon_page(struct page *page { unsigned long addr = (unsigned long) page_address(page); + if (PageHighMem(page)) { -+ flush_highmem_page(page); ++ addr = (unsigned long)kmap_atomic(page); ++ flush_data_cache_page(addr); ++ __kunmap_atomic((void *)addr); + return; + } + if (pages_do_alias(addr, vmaddr)) { if (page_mapped(page) && !Page_dcache_dirty(page)) { void *kaddr; -@@ -123,8 +140,10 @@ void __flush_icache_page(struct vm_area_ - { - unsigned long addr; - -- if (PageHighMem(page)) -+ if (PageHighMem(page)) { -+ flush_highmem_page(page); - return; -+ } - - addr = (unsigned long) page_address(page); - flush_data_cache_page(addr); -@@ -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) || !page_mapping(page)) -+ return; -+ -+ if (PageHighMem(page)) { -+ flush_highmem_page(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; -- cgit v1.2.3