aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-12 11:49:46 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-12 15:51:54 +0200
commit0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6 (patch)
tree51382c24cd68a4129cf7bdbbedd84b24c70e47b1 /target/linux/generic
parent1da87516e584a86d1d056f6b58bfa3050cc875b9 (diff)
downloadupstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.tar.gz
upstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.tar.bz2
upstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.zip
kernel: update kernel 4.4 to version 4.4.13
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch78
-rw-r--r--target/linux/generic/patches-4.4/206-mips-disable-vdso.patch2
-rw-r--r--target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch6
3 files changed, 8 insertions, 78 deletions
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 <nbd@nbd.name>
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
-@@ -14,6 +14,7 @@
- #include <linux/sched.h>
- #include <linux/syscalls.h>
- #include <linux/mm.h>
-+#include <linux/highmem.h>
-
- #include <asm/cacheflush.h>
- #include <asm/processor.h>
-@@ -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;
diff --git a/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch b/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
index 1abe78f141..51b1d041bf 100644
--- a/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
+++ b/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
@@ -4,7 +4,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
-@@ -26,11 +26,11 @@ aflags-vdso := $(ccflags-vdso) \
+@@ -28,11 +28,11 @@ aflags-vdso := $(ccflags-vdso) \
# the comments on that file.
#
ifndef CONFIG_CPU_MIPSR6
diff --git a/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch b/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
index ed0445cecf..7dbde1d974 100644
--- a/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
+++ b/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
-@@ -75,7 +75,7 @@ $(obj-vdso): KBUILD_AFLAGS := $(aflags-v
+@@ -77,7 +77,7 @@ $(obj-vdso): KBUILD_AFLAGS := $(aflags-v
$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(native-abi)
@@ -9,7 +9,7 @@
$(call if_changed,vdsold)
$(obj)/vdso-image.c: $(obj)/vdso.so.dbg $(obj)/genvdso FORCE
-@@ -109,7 +109,7 @@ $(obj)/vdso-o32.lds: KBUILD_CPPFLAGS :=
+@@ -111,7 +111,7 @@ $(obj)/vdso-o32.lds: KBUILD_CPPFLAGS :=
$(obj)/vdso-o32.lds: $(src)/vdso.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)
@@ -18,7 +18,7 @@
$(call if_changed,vdsold)
$(obj)/vdso-o32-image.c: VDSO_NAME := o32
-@@ -145,7 +145,7 @@ $(obj)/vdso-n32.lds: KBUILD_CPPFLAGS :=
+@@ -147,7 +147,7 @@ $(obj)/vdso-n32.lds: KBUILD_CPPFLAGS :=
$(obj)/vdso-n32.lds: $(src)/vdso.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)