aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2008-05-24 17:40:16 +0000
committerChris Wright <chrisw@sous-sol.org>2008-06-09 11:27:01 -0700
commit687b21a34349aea5f9cf9bab07e7a981500d8a67 (patch)
tree24af20bb142ea8b81e7b501ece5c6be905864b64 /arch/x86
parentbbd8ceb5e10bfcf6e235eba1a8b1c5d00f0c5137 (diff)
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>
Diffstat (limited to 'arch/x86')
-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 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 */