diff options
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index cb705fdbb458..8829b1095f7f 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
| @@ -63,11 +63,13 @@ BEGIN_FTR_SECTION | |||
| 63 | GET_PACA(r13) | 63 | GET_PACA(r13) |
| 64 | 64 | ||
| 65 | #ifdef CONFIG_KVM_BOOK3S_64_HV | 65 | #ifdef CONFIG_KVM_BOOK3S_64_HV |
| 66 | lbz r0,PACAPROCSTART(r13) | 66 | li r0,KVM_HWTHREAD_IN_KERNEL |
| 67 | cmpwi r0,0x80 | 67 | stb r0,HSTATE_HWTHREAD_STATE(r13) |
| 68 | bne 1f | 68 | /* Order setting hwthread_state vs. testing hwthread_req */ |
| 69 | li r0,1 | 69 | sync |
| 70 | stb r0,PACAPROCSTART(r13) | 70 | lbz r0,HSTATE_HWTHREAD_REQ(r13) |
| 71 | cmpwi r0,0 | ||
| 72 | beq 1f | ||
| 71 | b kvm_start_guest | 73 | b kvm_start_guest |
| 72 | 1: | 74 | 1: |
| 73 | #endif | 75 | #endif |