From b80ebcbe3c36ca5c0ca42e2ec25a9758d59b88a2 Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Thu, 9 May 2013 21:55:27 +0530 Subject: [PATCH] --- yaml --- r: 375099 b: refs/heads/master c: de2a852cc0d4c4d6a9c22a597c9cc231f2e6ceb4 h: refs/heads/master i: 375097: b544515c7c81451bbd7be1092a6284be9d08c5fd 375095: 9efbe713a49041342c8d1c934b55748ecb1d1bb1 v: v3 --- [refs] | 2 +- trunk/arch/arc/include/asm/cacheflush.h | 4 +++- trunk/arch/arc/mm/cache_arc700.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 463725e388a6..afea029bbae3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4102b53392d6397d80b6e09b516517efacf7ea77 +refs/heads/master: de2a852cc0d4c4d6a9c22a597c9cc231f2e6ceb4 diff --git a/trunk/arch/arc/include/asm/cacheflush.h b/trunk/arch/arc/include/asm/cacheflush.h index d692fbb17254..14a0fea0029e 100644 --- a/trunk/arch/arc/include/asm/cacheflush.h +++ b/trunk/arch/arc/include/asm/cacheflush.h @@ -33,7 +33,9 @@ void flush_cache_all(void); void flush_icache_range(unsigned long start, unsigned long end); void __sync_icache_dcache(unsigned long paddr, unsigned long vaddr, int len); void __inv_icache_page(unsigned long paddr, unsigned long vaddr); -void __flush_dcache_page(unsigned long paddr, unsigned long vaddr); +void ___flush_dcache_page(unsigned long paddr, unsigned long vaddr); +#define __flush_dcache_page(p, v) \ + ___flush_dcache_page((unsigned long)p, (unsigned long)v) #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 diff --git a/trunk/arch/arc/mm/cache_arc700.c b/trunk/arch/arc/mm/cache_arc700.c index 9887195379ef..2f12bca8aef3 100644 --- a/trunk/arch/arc/mm/cache_arc700.c +++ b/trunk/arch/arc/mm/cache_arc700.c @@ -624,7 +624,7 @@ void __inv_icache_page(unsigned long paddr, unsigned long vaddr) * wrapper to clearout kernel or userspace mappings of a page * For kernel mappings @vaddr == @paddr */ -void __flush_dcache_page(unsigned long paddr, unsigned long vaddr) +void ___flush_dcache_page(unsigned long paddr, unsigned long vaddr) { __dc_line_op(paddr, vaddr & PAGE_MASK, PAGE_SIZE, OP_FLUSH_N_INV); }