From 26a2ebb175257c57cea0932b00ebcab1de7ce3f8 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Wed, 22 Oct 2008 18:00:09 +0400 Subject: [PATCH] --- yaml --- r: 117681 b: refs/heads/master c: db96b0a0e4158806fcf03945a870f9320e6bac9b h: refs/heads/master i: 117679: da7ed8802781bb4cb5921a351415b3fb950a4776 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smpboot.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b3ab18aa51ab..c2ed95906bb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d433c407dea248c8db09edbc0b3c245977d596f +refs/heads/master: db96b0a0e4158806fcf03945a870f9320e6bac9b diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c index 7ece815ea637..7b1093397319 100644 --- a/trunk/arch/x86/kernel/smpboot.c +++ b/trunk/arch/x86/kernel/smpboot.c @@ -893,9 +893,11 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) smpboot_setup_warm_reset_vector(start_ip); /* * Be paranoid about clearing APIC errors. - */ - apic_write(APIC_ESR, 0); - apic_read(APIC_ESR); + */ + if (APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) { + apic_write(APIC_ESR, 0); + apic_read(APIC_ESR); + } } /*