From: Chuck Ebbert <cebbert@redhat.com>
Date: Sat, 24 May 2008 17:40:16 +0000 (+0000)
Subject: x86: don't read maxlvt before checking if APIC is mapped
X-Git-Tag: v2.6.25.6~29
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=687b21a34349aea5f9cf9bab07e7a981500d8a67;p=unionfs-2.6.39.y.git

x86: don't read maxlvt before checking if APIC is mapped

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

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index d8d03e09dea..96294347611 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -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 */