diff options
| author | Alexander Graf <agraf@suse.de> | 2012-10-31 08:36:18 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-31 08:36:18 -0400 |
| commit | 0588000eac9ba4178cebade437da3b28e8fad48f (patch) | |
| tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 /arch/powerpc/kvm/book3s_hv_rmhandlers.S | |
| parent | 8b5869ad85f703ffeb25e656eab826f6b85b984c (diff) | |
| parent | 81c52c56e2b43589091ee29038bcf793d3f184ab (diff) | |
Merge commit 'origin/queue' into for-queue
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_rmhandlers.S')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 1e90ef6191a3..690d1120402d 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S | |||
| @@ -1068,7 +1068,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206) | |||
| 1068 | mtspr SPRN_DABRX,r6 | 1068 | mtspr SPRN_DABRX,r6 |
| 1069 | 1069 | ||
| 1070 | /* Restore SPRG3 */ | 1070 | /* Restore SPRG3 */ |
| 1071 | ld r3,HSTATE_SPRG3(r13) | 1071 | ld r3,PACA_SPRG3(r13) |
| 1072 | mtspr SPRN_SPRG3,r3 | 1072 | mtspr SPRN_SPRG3,r3 |
| 1073 | 1073 | ||
| 1074 | /* | 1074 | /* |