diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-05 10:17:45 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-05 10:17:45 -0400 |
commit | f00a75c094c340c4e7435665816c3273c870e849 (patch) | |
tree | 079eaaa6101806b8b6d3de9cd8ce5df3c69bb286 /arch/arm/mm/copypage-v6.c | |
parent | 8a0382f6fceaf0c6479e582e1054f36333ea3d24 (diff) |
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.c | 4 |
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); | |||
34 | * attack the kernel's existing mapping of these pages. | 34 | * attack the kernel's existing mapping of these pages. |
35 | */ | 35 | */ |
36 | static void v6_copy_user_highpage_nonaliasing(struct page *to, | 36 | static void v6_copy_user_highpage_nonaliasing(struct page *to, |
37 | struct page *from, unsigned long vaddr) | 37 | struct page *from, unsigned long vaddr, struct vm_area_struct *vma) |
38 | { | 38 | { |
39 | void *kto, *kfrom; | 39 | void *kto, *kfrom; |
40 | 40 | ||
@@ -73,7 +73,7 @@ static void discard_old_kernel_data(void *kto) | |||
73 | * Copy the page, taking account of the cache colour. | 73 | * Copy the page, taking account of the cache colour. |
74 | */ | 74 | */ |
75 | static void v6_copy_user_highpage_aliasing(struct page *to, | 75 | static void v6_copy_user_highpage_aliasing(struct page *to, |
76 | struct page *from, unsigned long vaddr) | 76 | struct page *from, unsigned long vaddr, struct vm_area_struct *vma) |
77 | { | 77 | { |
78 | unsigned int offset = CACHE_COLOUR(vaddr); | 78 | unsigned int offset = CACHE_COLOUR(vaddr); |
79 | unsigned long kfrom, kto; | 79 | unsigned long kfrom, kto; |