Commit c7209ef9 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] x86: quieten the "ESR value" printks

Only print out the ESR value if it changes after enabling vector.
Signed-off-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2c4fc034
...@@ -343,7 +343,7 @@ void __init init_bsp_APIC(void) ...@@ -343,7 +343,7 @@ void __init init_bsp_APIC(void)
void __init setup_local_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 */ /* Pound the ESR really hard over the head with a big hammer - mbligh */
if (esr_disable) { if (esr_disable) {
...@@ -459,9 +459,7 @@ void __init setup_local_APIC (void) ...@@ -459,9 +459,7 @@ void __init setup_local_APIC (void)
maxlvt = get_maxlvt(); maxlvt = get_maxlvt();
if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */
apic_write(APIC_ESR, 0); apic_write(APIC_ESR, 0);
value = apic_read(APIC_ESR); oldvalue = apic_read(APIC_ESR);
apic_printk(APIC_VERBOSE, "ESR value before enabling vector:"
" %08lx\n", value);
value = ERROR_APIC_VECTOR; // enables sending errors value = ERROR_APIC_VECTOR; // enables sending errors
apic_write_around(APIC_LVTERR, value); apic_write_around(APIC_LVTERR, value);
...@@ -471,8 +469,10 @@ void __init setup_local_APIC (void) ...@@ -471,8 +469,10 @@ void __init setup_local_APIC (void)
if (maxlvt > 3) if (maxlvt > 3)
apic_write(APIC_ESR, 0); apic_write(APIC_ESR, 0);
value = apic_read(APIC_ESR); value = apic_read(APIC_ESR);
apic_printk(APIC_VERBOSE, "ESR value after enabling vector:" if (value != oldvalue)
" %08lx\n", value); apic_printk(APIC_VERBOSE, "ESR value before enabling "
"vector: 0x%08lx after: 0x%08lx\n",
oldvalue, value);
} else { } else {
if (esr_disable) if (esr_disable)
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment