aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/apic.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-09-14 11:55:38 +0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:10 +0200
commit08ad776e3c54e6fe8b50939f176538063b69f89e (patch)
tree825e58b48e56ae9c4d0f95020b61a95fd5b69043 /arch/x86/kernel/apic.c
parent9df08f109572e88fbdab9a61d5cb0f0eae4ac9fa (diff)
x86: apic - skip writting ESR register if we dont have on
On 82489DX we don't have ESR register so we should not write it. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic.c')
-rw-r--r--arch/x86/kernel/apic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 59550cc017d..d730e8d3172 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1131,7 +1131,7 @@ void __cpuinit setup_local_APIC(void)
#ifdef CONFIG_X86_32
/* Pound the ESR really hard over the head with a big hammer - mbligh */
- if (esr_disable) {
+ if (lapic_is_integrated() && esr_disable) {
apic_write(APIC_ESR, 0);
apic_write(APIC_ESR, 0);
apic_write(APIC_ESR, 0);