diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-08-16 12:39:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-08-16 12:39:57 +1000 |
| commit | cc174224989cf013ac230b9e9007483baff4fd42 (patch) | |
| tree | 8097edf1b1b0baf67b1a9ffc80f02db100c3b51c /arch/arm | |
| parent | 5a248968ca3c029f78501a49ce68f98e30ba41bd (diff) | |
| parent | eebed2438923f8df465c27f8fa41303771fdb2e8 (diff) | |
Merge remote-tracking branch 'kvm/linux-next'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kvm/handle_exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c index 54442e375354..cf8bf6bf87c4 100644 --- a/arch/arm/kvm/handle_exit.c +++ b/arch/arm/kvm/handle_exit.c @@ -67,7 +67,7 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) if (kvm_vcpu_get_hsr(vcpu) & HSR_WFI_IS_WFE) { trace_kvm_wfx(*vcpu_pc(vcpu), true); vcpu->stat.wfe_exit_stat++; - kvm_vcpu_on_spin(vcpu); + kvm_vcpu_on_spin(vcpu, vcpu_mode_priv(vcpu)); } else { trace_kvm_wfx(*vcpu_pc(vcpu), false); vcpu->stat.wfi_exit_stat++; |