2008-06-07 01:16:47

by Chris Wright

[permalink] [raw]
Subject: [patch 23/50] x86: dont read maxlvt before checking if APIC is mapped

-stable review patch. If anyone has any objections, please let us know.
---------------------

From: Chuck Ebbert <[email protected]>

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 <[email protected]>
Cc: Andi Kleen <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
arch/x86/kernel/apic_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -524,7 +524,7 @@ int setup_profiling_timer(unsigned int m
*/
void clear_local_APIC(void)
{
- int maxlvt = lapic_get_maxlvt();
+ int maxlvt;
u32 v;

/* APIC hasn't been mapped yet */

--