diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:50 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:50 +0800 |
commit | 864b6e70253ae07b58bb126d29a35be22f50f453 (patch) | |
tree | 21f2021685284c01035f1cf03c1ff0b3c66da008 /arch/arm/kvm/guest.c | |
parent | 405b4c1452cb59ce07632a60d3e3152ab9243ae6 (diff) | |
parent | 421a8ddd1fc901897eee73965b442af4b4dd7095 (diff) |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.03-android
Diffstat (limited to 'arch/arm/kvm/guest.c')
-rw-r--r-- | arch/arm/kvm/guest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c index 8c97208b9b97..be68848071fd 100644 --- a/arch/arm/kvm/guest.c +++ b/arch/arm/kvm/guest.c @@ -173,7 +173,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; } static unsigned long num_core_regs(void) |