[PATCH -tip] x86: do_boot_cpu - check if we have ESR register

[Cyrill Gorcunov]

We should touch ESR register if only we have it.
The patch fixes the problem mentoined here

	http://lkml.org/lkml/2008/10/17/147

Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
CC: Glauber Costa <glommer@xxxxxxxxx>
---

 arch/x86/kernel/smpboot.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: linux-2.6.git/arch/x86/kernel/smpboot.c
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/smpboot.c	2008-10-21 20:35:27.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/smpboot.c	2008-10-22 17:45:28.000000000 +0400
@@ -894,8 +894,10 @@ do_rest:
 		/*
 		 * Be paranoid about clearing APIC errors.
 	 	*/
-		apic_write(APIC_ESR, 0);
-		apic_read(APIC_ESR);
+		if (APIC_INTEGRATED(apic_version[phys_apicid])) {
+			apic_write(APIC_ESR, 0);
+			apic_read(APIC_ESR);
+		}
 	}
 
 	/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/