diff options
author | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:11 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:11 +0000 |
commit | b66b0ae6323fea7dedd400785c556a39a30cdf4f (patch) | |
tree | 39e4b36e44832bd91191c42710da2876cff563a7 /target/linux/brcm47xx/patches-3.14/310-no_highpage.patch | |
parent | fc08d7a3eb6a50d6d62a33e3de66e92dffb4ad7d (diff) | |
download | upstream-b66b0ae6323fea7dedd400785c556a39a30cdf4f.tar.gz upstream-b66b0ae6323fea7dedd400785c556a39a30cdf4f.tar.bz2 upstream-b66b0ae6323fea7dedd400785c556a39a30cdf4f.zip |
brcm47xx: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 45374
Diffstat (limited to 'target/linux/brcm47xx/patches-3.14/310-no_highpage.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.14/310-no_highpage.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/target/linux/brcm47xx/patches-3.14/310-no_highpage.patch b/target/linux/brcm47xx/patches-3.14/310-no_highpage.patch deleted file mode 100644 index 57b0bb865f..0000000000 --- a/target/linux/brcm47xx/patches-3.14/310-no_highpage.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/arch/mips/include/asm/page.h -+++ b/arch/mips/include/asm/page.h -@@ -71,6 +71,7 @@ static inline unsigned int page_size_ftl - #endif /* CONFIG_MIPS_HUGE_TLB_SUPPORT */ - - #include <linux/pfn.h> -+#include <asm/cpu-features.h> - - extern void build_clear_page(void); - extern void build_copy_page(void); -@@ -105,13 +106,16 @@ static inline void clear_user_page(void - flush_data_cache_page((unsigned long)addr); - } - --extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, -- struct page *to); --struct vm_area_struct; --extern void copy_user_highpage(struct page *to, struct page *from, -- unsigned long vaddr, struct vm_area_struct *vma); -+static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, -+ struct page *to) -+{ -+ extern void (*flush_data_cache_page)(unsigned long addr); - --#define __HAVE_ARCH_COPY_USER_HIGHPAGE -+ copy_page(vto, vfrom); -+ if (!cpu_has_ic_fills_f_dc || -+ pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK)) -+ flush_data_cache_page((unsigned long)vto); -+} - - /* - * These are used to make use of C type-checking.. ---- a/arch/mips/mm/init.c -+++ b/arch/mips/mm/init.c -@@ -194,30 +194,6 @@ void kunmap_coherent(void) - pagefault_enable(); - } - --void copy_user_highpage(struct page *to, struct page *from, -- unsigned long vaddr, struct vm_area_struct *vma) --{ -- void *vfrom, *vto; -- -- vto = kmap_atomic(to); -- if (cpu_has_dc_aliases && cpu_use_kmap_coherent && -- page_mapped(from) && !Page_dcache_dirty(from)) { -- vfrom = kmap_coherent(from, vaddr); -- copy_page(vto, vfrom); -- kunmap_coherent(); -- } else { -- vfrom = kmap_atomic(from); -- copy_page(vto, vfrom); -- kunmap_atomic(vfrom); -- } -- if ((!cpu_has_ic_fills_f_dc) || -- pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK)) -- flush_data_cache_page((unsigned long)vto); -- kunmap_atomic(vto); -- /* Make sure this page is cleared on other CPU's too before using it */ -- smp_wmb(); --} -- - void copy_to_user_page(struct vm_area_struct *vma, - struct page *page, unsigned long vaddr, void *dst, const void *src, - unsigned long len) |