diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:32:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:32:21 +0800 |
| commit | fa6e6c7406806f9d4119703e4c3ad661c25b99ee (patch) | |
| tree | 7b9c905e1befea12b5c04190d1aa3c89b3dfdd84 /arch/arm64/kvm/guest.c | |
| parent | 582ee3a96f6a108f589bdc4ce8cc8176c8d763e5 (diff) | |
| parent | 258181e60ef13001b0ae05cb58079fd79ed86a46 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts solution:
keep 'KBUILD_CFLAGS += -fno-pic'
in arch/arm64/Makefile
Diffstat (limited to 'arch/arm64/kvm/guest.c')
| -rw-r--r-- | arch/arm64/kvm/guest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index d250160d32bc..3039f080e2d5 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -186,7 +186,7 @@ static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) u64 val; val = kvm_arm_timer_get_reg(vcpu, reg->id); - return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id)); + return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id)) ? -EFAULT : 0; } /** |