Message ID | 1323985698-6371-1-git-send-email-u.kleine-koenig@pengutronix.de |
---|---|
State | New |
Headers | show |
On Thu, Dec 15, 2011 at 10:48:18PM +0100, Uwe Kleine-König wrote: > vma isn't used and flush_cache_user_range isn't a standard macro that > is used on several archs with the same prototype. In fact only unicore32 > has a macro with the same name (with an identical implementation and no > in-tree users). > > This is a part of a patch proposed by Dima Zavin (with Message-id: > 1272439931-12795-1-git-send-email-dima@android.com) that didn't get > accepted. > > Cc: Dima Zavin <dima@android.com> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- Hello, oh I forgot to add From: Dima Zavin <dima@android.com> This was done by mistake and not to hijack authorship. Sorry Uwe
2011/12/15 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>: > vma isn't used and flush_cache_user_range isn't a standard macro that > is used on several archs with the same prototype. In fact only unicore32 > has a macro with the same name (with an identical implementation and no > in-tree users). > > This is a part of a patch proposed by Dima Zavin (with Message-id: > 1272439931-12795-1-git-send-email-dima@android.com) that didn't get > accepted. > > Cc: Dima Zavin <dima@android.com> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Catalin Marinas <catalin.marinas@arm.com> I had this change as part of Dima's other patch to solve the user cache maintenance race (but Russell didn't like it - http://thread.gmane.org/gmane.linux.ports.arm.kernel/139111)
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index d5d8d5c..1252a26 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -249,7 +249,7 @@ extern void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr * Harvard caches are synchronised for the user space address range. * This is used for the ARM private sys_cacheflush system call. */ -#define flush_cache_user_range(vma,start,end) \ +#define flush_cache_user_range(start,end) \ __cpuc_coherent_user_range((start) & PAGE_MASK, PAGE_ALIGN(end)) /* diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 99a5727..f363ad9 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -488,7 +488,7 @@ do_cache_op(unsigned long start, unsigned long end, int flags) if (end > vma->vm_end) end = vma->vm_end; - flush_cache_user_range(vma, start, end); + flush_cache_user_range(start, end); } up_read(&mm->mmap_sem); }
vma isn't used and flush_cache_user_range isn't a standard macro that is used on several archs with the same prototype. In fact only unicore32 has a macro with the same name (with an identical implementation and no in-tree users). This is a part of a patch proposed by Dima Zavin (with Message-id: 1272439931-12795-1-git-send-email-dima@android.com) that didn't get accepted. Cc: Dima Zavin <dima@android.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- arch/arm/include/asm/cacheflush.h | 2 +- arch/arm/kernel/traps.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)