diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/powerpc/lib | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/copypage_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/copypage_64.S b/arch/powerpc/lib/copypage_64.S index 75f3267fdc30..e68beac0a171 100644 --- a/arch/powerpc/lib/copypage_64.S +++ b/arch/powerpc/lib/copypage_64.S | |||
| @@ -26,11 +26,11 @@ BEGIN_FTR_SECTION | |||
| 26 | srd r8,r5,r11 | 26 | srd r8,r5,r11 |
| 27 | 27 | ||
| 28 | mtctr r8 | 28 | mtctr r8 |
| 29 | setup: | 29 | .Lsetup: |
| 30 | dcbt r9,r4 | 30 | dcbt r9,r4 |
| 31 | dcbz r9,r3 | 31 | dcbz r9,r3 |
| 32 | add r9,r9,r12 | 32 | add r9,r9,r12 |
| 33 | bdnz setup | 33 | bdnz .Lsetup |
| 34 | END_FTR_SECTION_IFSET(CPU_FTR_CP_USE_DCBTZ) | 34 | END_FTR_SECTION_IFSET(CPU_FTR_CP_USE_DCBTZ) |
| 35 | addi r3,r3,-8 | 35 | addi r3,r3,-8 |
| 36 | srdi r8,r5,7 /* page is copied in 128 byte strides */ | 36 | srdi r8,r5,7 /* page is copied in 128 byte strides */ |