projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[powerpc.git]
/
arch
/
powerpc
/
lib
/
copyuser_64.S
diff --git
a/arch/powerpc/lib/copyuser_64.S
b/arch/powerpc/lib/copyuser_64.S
index
a0b3fbb
..
a6b54cb
100644
(file)
--- a/
arch/powerpc/lib/copyuser_64.S
+++ b/
arch/powerpc/lib/copyuser_64.S
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc64/lib/copyuser.S
- *
* Copyright (C) 2002 Paul Mackerras, IBM Corp.
*
* This program is free software; you can redistribute it and/or
* Copyright (C) 2002 Paul Mackerras, IBM Corp.
*
* This program is free software; you can redistribute it and/or
@@
-24,7
+22,7
@@
_GLOBAL(__copy_tofrom_user)
std r4,-16(r1)
std r5,-8(r1)
dcbt 0,r4
std r4,-16(r1)
std r5,-8(r1)
dcbt 0,r4
- beq .Lcopy_page
+ beq .Lcopy_page
_4K
andi. r6,r6,7
mtcrf 0x01,r5
blt cr1,.Lshort_copy
andi. r6,r6,7
mtcrf 0x01,r5
blt cr1,.Lshort_copy
@@
-366,7
+364,7
@@
_GLOBAL(__copy_tofrom_user)
* above (following the .Ldst_aligned label) but it runs slightly
* slower on POWER3.
*/
* above (following the .Ldst_aligned label) but it runs slightly
* slower on POWER3.
*/
-.Lcopy_page:
+.Lcopy_page
_4K
:
std r31,-32(1)
std r30,-40(1)
std r29,-48(1)
std r31,-32(1)
std r30,-40(1)
std r29,-48(1)