x86: kvm: rename migrate_count variable
As thats more indicative of the variables usage.
Suggested by Andy Lutomirski.
Signed-off-by Marcelo Tosatti <[email protected]>
arch/x86/include/asm/pvclock.h +1 -1
@@ -95,7 +95,7 @@ unsigned __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src,struct pvclock_vsyscall_time_info {struct pvclock_vcpu_time_info pvti; -u32 migrate_count; +u32 migrate_from_count; } __attribute__((__aligned__ (SMP_CACHE_BYTES )));#define PVTI_SIZE sizeof(struct pvclock_vsyscall_time_info)
arch/x86/kernel/pvclock.c +1 -1
@@ -172,7 +172,7 @@ static int pvclock_task_migrate(struct notifier_block *nb, unsigned long l,if (unlikely (pvti ==NULL ))return NOTIFY_DONE ; - pvti->migrate_count++; + pvti->migrate_from_count++;return NOTIFY_DONE ; }
arch/x86/vdso/vclock_gettime.c +3 -3
@@ -82,7 +82,7 @@ static notrace cycle_t vread_pvclock(int *mode)cycle_t ret;u64 last;u32 version; -u32 migrate_count; +u32 migrate_from_count;u8 flags;unsigned cpu, cpu1;
@@ -101,7 +101,7 @@ static notrace cycle_t vread_pvclock(int *mode) pvti =get_pvti (cpu); - migrate_count = pvti->migrate_count; + migrate_from_count = pvti->migrate_from_count; version =__pvclock_read_cycles (&pvti->pvti, &ret, &flags);
@@ -115,7 +115,7 @@ static notrace cycle_t vread_pvclock(int *mode) }while (unlikely (cpu != cpu1 || (pvti->pvti.version &1 ) || pvti->pvti.version != version || - pvti->migrate_count != migrate_count)); + pvti->migrate_from_count != migrate_from_count));if (unlikely (!(flags &PVCLOCK_TSC_STABLE_BIT ))) *mode =VCLOCK_NONE ;