x86: don't read maxlvt before checking if APIC is mapped
authorChuck Ebbert <cebbert@redhat.com>
Sat, 24 May 2008 17:40:16 +0000 (17:40 +0000)
committerChris Wright <chrisw@sous-sol.org>
Mon, 9 Jun 2008 18:27:01 +0000 (11:27 -0700)
upstream commit: 2584a82deed7196f48066f1b1a7fad4ec5bea961

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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
arch/x86/kernel/apic_64.c

index d8d03e09dea24a45e94903ae1c61a646d65777d1..9629434761127f2ecc68735aa9921bb1c36a368c 100644 (file)
@@ -524,7 +524,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 */