diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-09-23 11:01:45 -0700 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-10-15 14:25:14 +0200 |
| commit | a08546001c2b0f584ffc81987340943a7d6d6acb (patch) | |
| tree | bec5b932a875d8137eef2ffa576dee8411284ca8 /arch | |
| parent | 1f095610aabb9d54617901aa734d2a6093f2000c (diff) | |
| download | kernel_samsung_smdk4412-a08546001c2b0f584ffc81987340943a7d6d6acb.zip kernel_samsung_smdk4412-a08546001c2b0f584ffc81987340943a7d6d6acb.tar.gz kernel_samsung_smdk4412-a08546001c2b0f584ffc81987340943a7d6d6acb.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/pvclock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index 1c54b5f..4f9c55f 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -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) |