diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-23 19:26:10 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-23 19:26:10 -0400 |
| commit | cd427485357c0c4b99f69719251baacf25946e11 (patch) | |
| tree | ca1ff7eb2277dec42f1e20adc0b98c3c215ecfbe /arch/powerpc/kvm/book3s_hv_rmhandlers.S | |
| parent | d410ae2126481a74bc5be4a6242c4a232c19a984 (diff) | |
| parent | 48b16180d0d91324e5d2423c6d53d97bbe3dcc14 (diff) | |
Merge remote-tracking branch 'scott/next' into next
Freescale updates from Scott. Mostly support for critical
and machine check exceptions on 64-bit BookE, some new
PCI suspend/resume work and misc bits.
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 e66d4ec04d95..fbfca5778b0b 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S | |||
| @@ -75,8 +75,8 @@ BEGIN_FTR_SECTION | |||
| 75 | END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) | 75 | END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) |
| 76 | 76 | ||
| 77 | /* Restore SPRG3 */ | 77 | /* Restore SPRG3 */ |
| 78 | ld r3,PACA_SPRG3(r13) | 78 | ld r3,PACA_SPRG_VDSO(r13) |
| 79 | mtspr SPRN_SPRG3,r3 | 79 | mtspr SPRN_SPRG_VDSO_WRITE,r3 |
| 80 | 80 | ||
| 81 | /* Reload the host's PMU registers */ | 81 | /* Reload the host's PMU registers */ |
| 82 | ld r3, PACALPPACAPTR(r13) /* is the host using the PMU? */ | 82 | ld r3, PACALPPACAPTR(r13) /* is the host using the PMU? */ |