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-xsc3.c
diff --git
a/arch/arm/mm/copypage-xsc3.c
b/arch/arm/mm/copypage-xsc3.c
index
747ad41
..
f9cde07
100644
(file)
--- a/
arch/arm/mm/copypage-xsc3.c
+++ b/
arch/arm/mm/copypage-xsc3.c
@@
-34,7
+34,7
@@
xsc3_mc_copy_user_page(void *kto, const void *kfrom)
{
asm("\
stmfd sp!, {r4, r5, lr} \n\
{
asm("\
stmfd sp!, {r4, r5, lr} \n\
- mov lr, %
0
\n\
+ mov lr, %
2
\n\
\n\
pld [r1, #0] \n\
pld [r1, #32] \n\
\n\
pld [r1, #0] \n\
pld [r1, #32] \n\
@@
-67,7
+67,7
@@
xsc3_mc_copy_user_page(void *kto, const void *kfrom)
\n\
ldmfd sp!, {r4, r5, pc}"
:
\n\
ldmfd sp!, {r4, r5, pc}"
:
- : "I" (PAGE_SIZE / 64 - 1));
+ : "
r" (kto), "r" (kfrom), "
I" (PAGE_SIZE / 64 - 1));
}
void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
}
void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,