hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Harvey Harrison 2008-09-23 11:01:45 -07:00 committed by Avi Kivity
parent 1f095610aa
commit a08546001c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/pvclock.c
View File

@ -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) 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) if (src->tsc_shift < 0)
tsc_khz <<= -src->tsc_shift; pv_tsc_khz <<= -src->tsc_shift;
else else
tsc_khz >>= src->tsc_shift; pv_tsc_khz >>= src->tsc_shift;
return tsc_khz; return pv_tsc_khz;
} }
cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)