diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /arch/powerpc/kvm/book3s_hv_rmhandlers.S | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_rmhandlers.S')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 6dd33581a22..de2950135e6 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S | |||
| @@ -1251,7 +1251,7 @@ BEGIN_FTR_SECTION | |||
| 1251 | reg = 0 | 1251 | reg = 0 |
| 1252 | .rept 32 | 1252 | .rept 32 |
| 1253 | li r6,reg*16+VCPU_VSRS | 1253 | li r6,reg*16+VCPU_VSRS |
| 1254 | stxvd2x reg,r6,r3 | 1254 | STXVD2X(reg,r6,r3) |
| 1255 | reg = reg + 1 | 1255 | reg = reg + 1 |
| 1256 | .endr | 1256 | .endr |
| 1257 | FTR_SECTION_ELSE | 1257 | FTR_SECTION_ELSE |
| @@ -1313,7 +1313,7 @@ BEGIN_FTR_SECTION | |||
| 1313 | reg = 0 | 1313 | reg = 0 |
| 1314 | .rept 32 | 1314 | .rept 32 |
| 1315 | li r7,reg*16+VCPU_VSRS | 1315 | li r7,reg*16+VCPU_VSRS |
| 1316 | lxvd2x reg,r7,r4 | 1316 | LXVD2X(reg,r7,r4) |
| 1317 | reg = reg + 1 | 1317 | reg = reg + 1 |
| 1318 | .endr | 1318 | .endr |
| 1319 | FTR_SECTION_ELSE | 1319 | FTR_SECTION_ELSE |