]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
x86: pvclock: fix shadowed variable warning
authorHarvey Harrison <harvey.harrison@gmail.com>
Tue, 23 Sep 2008 18:01:45 +0000 (11:01 -0700)
committerAvi Kivity <avi@redhat.com>
Wed, 15 Oct 2008 12:25:14 +0000 (14:25 +0200)
commita08546001c2b0f584ffc81987340943a7d6d6acb
treebec5b932a875d8137eef2ffa576dee8411284ca8
parent1f095610aabb9d54617901aa734d2a6093f2000c
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>
arch/x86/kernel/pvclock.c