diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-11 07:39:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-11 07:39:37 +0200 |
| commit | ec0ad3d01f99d5e5b56a99a58f7003b99250dc65 (patch) | |
| tree | 85066cbea1cf8da6d099019adefaca90aae39234 /arch/powerpc/kvm/book3s_hv_rmhandlers.S | |
| parent | 3354781a2184380046c8dd19144628d3c33991e6 (diff) | |
| parent | 3f0116c3238a96bc18ad4b4acefe4e7be32fa861 (diff) | |
| download | op-kernel-dev-ec0ad3d01f99d5e5b56a99a58f7003b99250dc65.zip op-kernel-dev-ec0ad3d01f99d5e5b56a99a58f7003b99250dc65.tar.gz | |
Merge branch 'core/urgent' into sched/core
Merge in asm goto fix, to be able to apply the asm/rmwcc.h fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 294b7af..c71103b 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -1066,7 +1066,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206) BEGIN_FTR_SECTION mfspr r8, SPRN_DSCR ld r7, HSTATE_DSCR(r13) - std r8, VCPU_DSCR(r7) + std r8, VCPU_DSCR(r9) mtspr SPRN_DSCR, r7 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206) |
