Commit 02e0dbc9 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Fix mptables printk

This fixes the erroneous No mptables found printk on x86_64 mpparse.  We will
only print the message now if no mptables are found after all scans complete.
Signed-off-by: default avatarJustin M. Forbes <jmforbes@linuxtx.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f7635583
......@@ -576,7 +576,6 @@ static int __init smp_scan_config (unsigned long base, unsigned long length)
extern void __bad_mpf_size(void);
unsigned int *bp = phys_to_virt(base);
struct intel_mp_floating *mpf;
static int printed __initdata;
Dprintk("Scan SMP from %p for %ld bytes.\n", bp,length);
if (sizeof(*mpf) != 16)
......@@ -600,10 +599,6 @@ static int __init smp_scan_config (unsigned long base, unsigned long length)
bp += 4;
length -= 16;
}
if (!printed) {
printk(KERN_INFO "No mptable found.\n");
printed = 1;
}
return 0;
}
......@@ -640,7 +635,11 @@ void __init find_intel_smp (void)
address = *(unsigned short *)phys_to_virt(0x40E);
address <<= 4;
smp_scan_config(address, 0x1000);
if (smp_scan_config(address, 0x1000))
return;
/* If we have come this far, we did not find an MP table */
printk(KERN_INFO "No mptable found.\n");
}
/*
......
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