diff options
| author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2013-10-07 12:47:53 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-10-17 09:24:26 -0400 |
| commit | 3a167beac07cba597856c12b87638a06b0d53db7 (patch) | |
| tree | b7d484f8cb3519aec3177f914304b1d5e129d193 /arch/powerpc/kernel/exceptions-64s.S | |
| parent | 9975f5e3692d320b4259a4d2edd8a979adb1e535 (diff) | |
kvm: powerpc: Add kvmppc_ops callback
This patch add a new callback kvmppc_ops. This will help us in enabling
both HV and PR KVM together in the same kernel. The actual change to
enable them together is done in the later patch in the series.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[agraf: squash in booke changes]
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 3d1c42b03c89..9f905e40922e 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
| @@ -126,7 +126,7 @@ BEGIN_FTR_SECTION | |||
| 126 | bgt cr1,. | 126 | bgt cr1,. |
| 127 | GET_PACA(r13) | 127 | GET_PACA(r13) |
| 128 | 128 | ||
| 129 | #ifdef CONFIG_KVM_BOOK3S_64_HV | 129 | #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE |
| 130 | li r0,KVM_HWTHREAD_IN_KERNEL | 130 | li r0,KVM_HWTHREAD_IN_KERNEL |
| 131 | stb r0,HSTATE_HWTHREAD_STATE(r13) | 131 | stb r0,HSTATE_HWTHREAD_STATE(r13) |
| 132 | /* Order setting hwthread_state vs. testing hwthread_req */ | 132 | /* Order setting hwthread_state vs. testing hwthread_req */ |