git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mm
/
copypage-feroceon.c
diff --git
a/arch/arm/mm/copypage-feroceon.c
b/arch/arm/mm/copypage-feroceon.c
index
5eb4fd9
..
ac163de
100644
(file)
--- a/
arch/arm/mm/copypage-feroceon.c
+++ b/
arch/arm/mm/copypage-feroceon.c
@@
-18,7
+18,7
@@
feroceon_copy_user_page(void *kto, const void *kfrom)
{
asm("\
stmfd sp!, {r4-r9, lr} \n\
{
asm("\
stmfd sp!, {r4-r9, lr} \n\
- mov ip, %
0
\n\
+ mov ip, %
2
\n\
1: mov lr, r1 \n\
ldmia r1!, {r2 - r9} \n\
pld [lr, #32] \n\
1: mov lr, r1 \n\
ldmia r1!, {r2 - r9} \n\
pld [lr, #32] \n\
@@
-64,7
+64,7
@@
feroceon_copy_user_page(void *kto, const void *kfrom)
mcr p15, 0, ip, c7, c10, 4 @ drain WB\n\
ldmfd sp!, {r4-r9, pc}"
:
mcr p15, 0, ip, c7, c10, 4 @ drain WB\n\
ldmfd sp!, {r4-r9, pc}"
:
- : "I" (PAGE_SIZE));
+ : "
r" (kto), "r" (kfrom), "
I" (PAGE_SIZE));
}
void feroceon_copy_user_highpage(struct page *to, struct page *from,
}
void feroceon_copy_user_highpage(struct page *to, struct page *from,