Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / mips / kvm / vz.c

diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c
index 43cad10..4adca5a 100644 (file)
--- a/arch/mips/kvm/vz.c
+++ b/arch/mips/kvm/vz.c
@@ -388,7 +388,6 @@ static void _kvm_vz_restore_htimer(struct kvm_vcpu *vcpu,
                                   u32 compare, u32 cause)
 {
        u32 start_count, after_count;
-       ktime_t freeze_time;
        unsigned long flags;
 
        /*
@@ -396,7 +395,7 @@ static void _kvm_vz_restore_htimer(struct kvm_vcpu *vcpu,
         * this with interrupts disabled to avoid latency.
         */
        local_irq_save(flags);
-       freeze_time = kvm_mips_freeze_hrtimer(vcpu, &start_count);
+       kvm_mips_freeze_hrtimer(vcpu, &start_count);
        write_c0_gtoffset(start_count - read_c0_count());
        local_irq_restore(flags);