summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2008-05-21 00:18:12 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 14:08:06 +0200
commit2584a82deed7196f48066f1b1a7fad4ec5bea961 (patch)
tree483d1bfc53dc98e4a4ab3b070439028276532fce /arch
parentx86: disable TSC for sched_clock() when calibration failed (diff)
downloadlinux-2584a82deed7196f48066f1b1a7fad4ec5bea961.tar.xz
linux-2584a82deed7196f48066f1b1a7fad4ec5bea961.zip
x86: don't read maxlvt before checking if APIC is mapped
A check for unmapped apic was added before reading maxlvt but the early read of maxlvt wasn't removed. Signed-off-by: Chuck Ebbert <cebbert@redhat.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@kernel.org
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/apic_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 5910020c3f24..0633cfd0dc29 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -534,7 +534,7 @@ int setup_profiling_timer(unsigned int multiplier)
*/
void clear_local_APIC(void)
{
- int maxlvt = lapic_get_maxlvt();
+ int maxlvt;
u32 v;
/* APIC hasn't been mapped yet */