From: Chuck Ebbert <cebbert@redhat.com>
Date: Tue, 20 May 2008 22:18:12 +0000 (-0400)
Subject: x86: don't read maxlvt before checking if APIC is mapped
X-Git-Tag: v2.6.26-rc4~11^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2584a82deed7196f48066f1b1a7fad4ec5bea961;p=linux-2.6-omap-h63xx.git

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
---

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 5910020c3f2..0633cfd0dc2 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 */