From: Dave Jones <davej@redhat.com>
Only print out the ESR value if it changes after enabling vector.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/i386/kernel/apic.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/i386/kernel/apic.c~x86-esr-print-quietness arch/i386/kernel/apic.c
--- 25/arch/i386/kernel/apic.c~x86-esr-print-quietness 2004-08-15 13:51:13.635835960 -0700
+++ 25-akpm/arch/i386/kernel/apic.c 2004-08-15 13:53:33.804527080 -0700
@@ -344,7 +344,7 @@ void __init init_bsp_APIC(void)
void __init setup_local_APIC (void)
{
- unsigned long value, ver, maxlvt;
+ unsigned long oldvalue, value, ver, maxlvt;
/* Pound the ESR really hard over the head with a big hammer - mbligh */
if (esr_disable) {
@@ -460,9 +460,7 @@ void __init setup_local_APIC (void)
maxlvt = get_maxlvt();
if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */
apic_write(APIC_ESR, 0);
- value = apic_read(APIC_ESR);
- apic_printk(APIC_VERBOSE, "ESR value before enabling vector:"
- " %08lx\n", value);
+ oldvalue = apic_read(APIC_ESR);
value = ERROR_APIC_VECTOR; // enables sending errors
apic_write_around(APIC_LVTERR, value);
@@ -472,8 +470,10 @@ void __init setup_local_APIC (void)
if (maxlvt > 3)
apic_write(APIC_ESR, 0);
value = apic_read(APIC_ESR);
- apic_printk(APIC_VERBOSE, "ESR value after enabling vector:"
- " %08lx\n", value);
+ if (value != oldvalue)
+ apic_printk(APIC_VERBOSE, "ESR value before enabling "
+ "vector: 0x%08lx after: 0x%08lx\n",
+ oldvalue, value);
} else {
if (esr_disable)
/*
_