From ef33baa66391a8d530a941c2286fe5be112a59c1 Mon Sep 17 00:00:00 2001 From: Nickolai Zeldovich Date: Sat, 15 Dec 2012 06:34:37 -0500 Subject: [PATCH] --- yaml --- r: 356795 b: refs/heads/master c: d4b06c2d4cce466e2d62163c0a954e1b2ce96f8b h: refs/heads/master i: 356793: a031d8207cbc238a11e619627b8aadb01d59ba85 356791: 0222c38880d5cb4d8bb5342081a17420626ad098 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/i8254.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2c21e1afea69..eebffaa7718d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e11ae1a102b46f76441e328a2743ae5d6e201423 +refs/heads/master: d4b06c2d4cce466e2d62163c0a954e1b2ce96f8b diff --git a/trunk/arch/x86/kvm/i8254.c b/trunk/arch/x86/kvm/i8254.c index 11300d2fa714..c1d30b2fc9bb 100644 --- a/trunk/arch/x86/kvm/i8254.c +++ b/trunk/arch/x86/kvm/i8254.c @@ -122,7 +122,6 @@ static s64 __kpit_elapsed(struct kvm *kvm) */ remaining = hrtimer_get_remaining(&ps->timer); elapsed = ps->period - ktime_to_ns(remaining); - elapsed = mod_64(elapsed, ps->period); return elapsed; }