From 6ffb0fcf20627c6bc014893b0e5e95229db4046b Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 6 Feb 2006 13:24:53 +1100 Subject: [PATCH] --- yaml --- r: 20076 b: refs/heads/master c: 09f5dc44aeff9f792a807a7dca64c1791d98d8c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/mem.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 35de845d2ea0..4342644c36b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95eff20feb679a2223a6da1e7f272fe9aa99591e +refs/heads/master: 09f5dc44aeff9f792a807a7dca64c1791d98d8c8 diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c index 15aac0d78dfa..550517c2dd42 100644 --- a/trunk/arch/powerpc/mm/mem.c +++ b/trunk/arch/powerpc/mm/mem.c @@ -435,17 +435,12 @@ void clear_user_page(void *page, unsigned long vaddr, struct page *pg) { clear_page(page); - if (cpu_has_feature(CPU_FTR_COHERENT_ICACHE)) - return; /* * We shouldnt have to do this, but some versions of glibc * require it (ld.so assumes zero filled pages are icache clean) * - Anton */ - - /* avoid an atomic op if possible */ - if (test_bit(PG_arch_1, &pg->flags)) - clear_bit(PG_arch_1, &pg->flags); + flush_dcache_page(pg); } EXPORT_SYMBOL(clear_user_page); @@ -469,12 +464,7 @@ void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, return; #endif - if (cpu_has_feature(CPU_FTR_COHERENT_ICACHE)) - return; - - /* avoid an atomic op if possible */ - if (test_bit(PG_arch_1, &pg->flags)) - clear_bit(PG_arch_1, &pg->flags); + flush_dcache_page(pg); } void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,