lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] Make v6 copypage function static and cleanup pgprots

Browse Source 
We know what pgprot we're going to use, so don't #define it.  Also,
since we select the nonaliasing/aliasing copypage implementation at
run time, there's no point having it globally visible.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2005-10-30 19:03:21 +00:00
committed by Russell King
parent d362979aa2
commit b4c2803ca8
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mm/copypage-v6.c
View File

@@ -22,9 +22,7 @@
#endif #endif
#define from_address (0xffff8000) #define from_address (0xffff8000)
#define from_pgprot PAGE_KERNEL
#define to_address (0xffffc000) #define to_address (0xffffc000)
#define to_pgprot PAGE_KERNEL
#define TOP_PTE(x) pte_offset_kernel(top_pmd, x) #define TOP_PTE(x) pte_offset_kernel(top_pmd, x)
@@ -34,7 +32,7 @@ static DEFINE_SPINLOCK(v6_lock);
* Copy the user page. No aliasing to deal with so we can just * Copy the user page. No aliasing to deal with so we can just
* attack the kernel's existing mapping of these pages. * attack the kernel's existing mapping of these pages.
*/ */
void v6_copy_user_page_nonaliasing(void *kto, const void *kfrom, unsigned long vaddr) static void v6_copy_user_page_nonaliasing(void *kto, const void *kfrom, unsigned long vaddr)
{ {
copy_page(kto, kfrom); copy_page(kto, kfrom);
} }
@@ -43,7 +41,7 @@ void v6_copy_user_page_nonaliasing(void *kto, const void *kfrom, unsigned long v
* Clear the user page. No aliasing to deal with so we can just * Clear the user page. No aliasing to deal with so we can just
* attack the kernel's existing mapping of this page. * attack the kernel's existing mapping of this page.
*/ */
void v6_clear_user_page_nonaliasing(void *kaddr, unsigned long vaddr) static void v6_clear_user_page_nonaliasing(void *kaddr, unsigned long vaddr)
{ {
clear_page(kaddr); clear_page(kaddr);
} }
@@ -51,7 +49,7 @@ void v6_clear_user_page_nonaliasing(void *kaddr, unsigned long vaddr)
/* /*
* Copy the page, taking account of the cache colour. * Copy the page, taking account of the cache colour.
*/ */
void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned long vaddr) static void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned long vaddr)
{ {
unsigned int offset = CACHE_COLOUR(vaddr); unsigned int offset = CACHE_COLOUR(vaddr);
unsigned long from, to; unsigned long from, to;
@@ -72,8 +70,8 @@ void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned long vadd
*/ */
spin_lock(&v6_lock); spin_lock(&v6_lock);
set_pte(TOP_PTE(from_address) + offset, pfn_pte(__pa(kfrom) >> PAGE_SHIFT, from_pgprot)); set_pte(TOP_PTE(from_address) + offset, pfn_pte(__pa(kfrom) >> PAGE_SHIFT, PAGE_KERNEL));
set_pte(TOP_PTE(to_address) + offset, pfn_pte(__pa(kto) >> PAGE_SHIFT, to_pgprot)); set_pte(TOP_PTE(to_address) + offset, pfn_pte(__pa(kto) >> PAGE_SHIFT, PAGE_KERNEL));
from = from_address + (offset << PAGE_SHIFT); from = from_address + (offset << PAGE_SHIFT);
to = to_address + (offset << PAGE_SHIFT); to = to_address + (offset << PAGE_SHIFT);
@@ -91,7 +89,7 @@ void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned long vadd
* so remap the kernel page into the same cache colour as the user * so remap the kernel page into the same cache colour as the user
* page. * page.
*/ */
void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr) static void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr)
{ {
unsigned int offset = CACHE_COLOUR(vaddr); unsigned int offset = CACHE_COLOUR(vaddr);
unsigned long to = to_address + (offset << PAGE_SHIFT); unsigned long to = to_address + (offset << PAGE_SHIFT);
@@ -112,7 +110,7 @@ void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr)
*/ */
spin_lock(&v6_lock); spin_lock(&v6_lock);
set_pte(TOP_PTE(to_address) + offset, pfn_pte(__pa(kaddr) >> PAGE_SHIFT, to_pgprot)); set_pte(TOP_PTE(to_address) + offset, pfn_pte(__pa(kaddr) >> PAGE_SHIFT, PAGE_KERNEL));
flush_tlb_kernel_page(to); flush_tlb_kernel_page(to);
clear_page((void *)to); clear_page((void *)to);