Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0854600 authored by Harvey Harrison's avatar Harvey Harrison Committed by Avi Kivity
Browse files

x86: pvclock: fix shadowed variable warning 



arch/x86/kernel/pvclock.c:102:6: warning: symbol 'tsc_khz' shadows an earlier one
include/asm/tsc.h:18:21: originally declared here

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 1f095610

arch/x86/kernel/pvclock.c

+5 −5
Original line number Diff line number Diff line
@@ -99,14 +99,14 @@ static unsigned pvclock_get_time_values(struct pvclock_shadow_time *dst, 


unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)

{

	u64 tsc_khz = 1000000ULL << 32;

	u64 pv_tsc_khz = 1000000ULL << 32;



	do_div(tsc_khz, src->tsc_to_system_mul);

	do_div(pv_tsc_khz, src->tsc_to_system_mul);

	if (src->tsc_shift < 0)

		tsc_khz <<= -src->tsc_shift;

		pv_tsc_khz <<= -src->tsc_shift;

	else

		tsc_khz >>= src->tsc_shift;

	return tsc_khz;

		pv_tsc_khz >>= src->tsc_shift;

	return pv_tsc_khz;

}



cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)