aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mm/copypage-v6.c
diff options
context:
space:
mode:
authorGravatar Russell King <rmk+kernel@arm.linux.org.uk> 2009-10-05 15:17:45 +0100
committerGravatar Russell King <rmk+kernel@arm.linux.org.uk> 2009-10-05 15:17:45 +0100
commitf00a75c094c340c4e7435665816c3273c870e849 (patch)
tree079eaaa6101806b8b6d3de9cd8ce5df3c69bb286 /arch/arm/mm/copypage-v6.c
parentMerge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev (diff)
downloadlinux-f00a75c094c340c4e7435665816c3273c870e849.tar.gz
linux-f00a75c094c340c4e7435665816c3273c870e849.tar.bz2
linux-f00a75c094c340c4e7435665816c3273c870e849.zip
ARM: Pass VMA to copy_user_highpage() implementations
Our copy_user_highpage() implementations may require cache maintainence. Ensure that implementations have all necessary details to perform this maintainence. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/copypage-v6.c')
-rw-r--r--arch/arm/mm/copypage-v6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c
index 4127a7bddfe5..334d5602770e 100644
--- a/arch/arm/mm/copypage-v6.c
+++ b/arch/arm/mm/copypage-v6.c
@@ -34,7 +34,7 @@ static DEFINE_SPINLOCK(v6_lock);
* attack the kernel's existing mapping of these pages.
*/
static void v6_copy_user_highpage_nonaliasing(struct page *to,
- struct page *from, unsigned long vaddr)
+ struct page *from, unsigned long vaddr, struct vm_area_struct *vma)
{
void *kto, *kfrom;
@@ -73,7 +73,7 @@ static void discard_old_kernel_data(void *kto)
* Copy the page, taking account of the cache colour.
*/
static void v6_copy_user_highpage_aliasing(struct page *to,
- struct page *from, unsigned long vaddr)
+ struct page *from, unsigned long vaddr, struct vm_area_struct *vma)
{
unsigned int offset = CACHE_COLOUR(vaddr);
unsigned long kfrom, kto;