diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
| commit | 11cbb42a86895b88ac906a6768c998f9e98a37e2 (patch) | |
| tree | 3eaeec2cff4c7e34add793c77079cdc85b058bb8 /arch/arm64/kvm/inject_fault.c | |
| parent | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d (diff) | |
| parent | 95bcc3e563748f65c9fc0eb1bbc3f99b76efd4b2 (diff) | |
Merge remote-tracking branch 'origin/v4.4/topic/hibernate' into hikey-mainline-rebase-4.4hikey-hibernate-v4.4
Conflicts:
arch/arm64/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c
fs/proc/task_mmu.c
mm/memcontrol.c
Diffstat (limited to 'arch/arm64/kvm/inject_fault.c')
| -rw-r--r-- | arch/arm64/kvm/inject_fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c index 648112e90ed5..3972e65fbd5a 100644 --- a/arch/arm64/kvm/inject_fault.c +++ b/arch/arm64/kvm/inject_fault.c @@ -130,7 +130,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT); if (!is_iabt) - esr |= ESR_ELx_EC_DABT_LOW; + esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT; vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT; } |