Commit 94bb74c6 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] improve K7 SMP tainting.

If we have a non-SMP approved CPU, but its in a UP system,
we should allow SMP kernels.
parent fc2fcdab
...@@ -160,7 +160,6 @@ static void __init smp_store_cpu_info(int id) ...@@ -160,7 +160,6 @@ static void __init smp_store_cpu_info(int id)
goto valid_k7; goto valid_k7;
/* If we get here, it's not a certified SMP capable AMD system. */ /* If we get here, it's not a certified SMP capable AMD system. */
printk (KERN_INFO "WARNING: This combination of AMD processors is not suitable for SMP.\n");
tainted |= TAINT_UNSAFE_SMP; tainted |= TAINT_UNSAFE_SMP;
} }
...@@ -1068,6 +1067,15 @@ static void __init smp_boot_cpus(unsigned int max_cpus) ...@@ -1068,6 +1067,15 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
if (smp_b_stepping) if (smp_b_stepping)
printk(KERN_WARNING "WARNING: SMP operation may be unreliable with B stepping processors.\n"); printk(KERN_WARNING "WARNING: SMP operation may be unreliable with B stepping processors.\n");
/* Don't taint if we are running SMP kernel on a single non-MP approved Athlon */
if (tainted & TAINT_UNSAFE_SMP) {
if (cpucount)
printk (KERN_INFO "WARNING: This combination of AMD processors is not suitable for SMP.\n");
else
tainted &= ~TAINT_UNSAFE_SMP;
}
Dprintk("Boot done.\n"); Dprintk("Boot done.\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