diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:43 +0800 |
| commit | 241bca50dd1ae71a7cd7eebe579bd131bf986167 (patch) | |
| tree | f9d4af30aefba27b3c00074d935f8b5b01d54939 /arch/arm/kvm/guest.c | |
| parent | 1ebca975cbc0ab4708126e26bf2729777184f1e6 (diff) | |
| parent | 5cc3b58828a8bb2ebb34de96d1aec1564f912a31 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-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 d503fbb787d3..88993cc95e8e 100644 --- a/arch/arm/kvm/guest.c +++ b/arch/arm/kvm/guest.c @@ -155,7 +155,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) |