diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-06 22:42:09 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-06 22:42:09 -0500 |
| commit | c6135234550ed89a6fd0e8cb229633967e41d649 (patch) | |
| tree | 22cef33e314839c4fb30d6fc888c0caa2a0f6602 /arch/powerpc/lib/copyuser_64.S | |
| parent | 76032de898f34db55b5048349db56557828a1390 (diff) | |
| parent | 0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/lib/copyuser_64.S')
| -rw-r--r-- | arch/powerpc/lib/copyuser_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/copyuser_64.S b/arch/powerpc/lib/copyuser_64.S index a0b3fbbd6fb1..6d69ef39b7df 100644 --- a/arch/powerpc/lib/copyuser_64.S +++ b/arch/powerpc/lib/copyuser_64.S | |||
| @@ -24,7 +24,7 @@ _GLOBAL(__copy_tofrom_user) | |||
| 24 | std r4,-16(r1) | 24 | std r4,-16(r1) |
| 25 | std r5,-8(r1) | 25 | std r5,-8(r1) |
| 26 | dcbt 0,r4 | 26 | dcbt 0,r4 |
| 27 | beq .Lcopy_page | 27 | beq .Lcopy_page_4K |
| 28 | andi. r6,r6,7 | 28 | andi. r6,r6,7 |
| 29 | mtcrf 0x01,r5 | 29 | mtcrf 0x01,r5 |
| 30 | blt cr1,.Lshort_copy | 30 | blt cr1,.Lshort_copy |
| @@ -366,7 +366,7 @@ _GLOBAL(__copy_tofrom_user) | |||
| 366 | * above (following the .Ldst_aligned label) but it runs slightly | 366 | * above (following the .Ldst_aligned label) but it runs slightly |
| 367 | * slower on POWER3. | 367 | * slower on POWER3. |
| 368 | */ | 368 | */ |
| 369 | .Lcopy_page: | 369 | .Lcopy_page_4K: |
| 370 | std r31,-32(1) | 370 | std r31,-32(1) |
| 371 | std r30,-40(1) | 371 | std r30,-40(1) |
| 372 | std r29,-48(1) | 372 | std r29,-48(1) |