diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-26 10:52:34 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 10:52:34 +0200 |
| commit | 3ca113ea74836a80645c79adba24caaa7a74120c (patch) | |
| tree | dbb6f5ac7c3583cd7e2729f8e11fe676bbb3b84e /arch/i386 | |
| parent | 5758d5dfef1c514200bda3f29ba700f1c3e3bc99 (diff) | |
| download | op-kernel-dev-3ca113ea74836a80645c79adba24caaa7a74120c.zip op-kernel-dev-3ca113ea74836a80645c79adba24caaa7a74120c.tar.gz | |
[PATCH] i386: don't taint UP K7's running SMP kernels.
We have a test that looks for invalid pairings of certain athlon/durons
that weren't designed for SMP, and taint accordingly (with 'S') if we find
such a configuration. However, this test shouldn't fire if there's only
a single CPU present. It's perfectly valid for an SMP kernel to boot on UP
hardware for example.
AK: changed to num_possible_cpus()
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/smpboot.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 517eb38..020d873 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c @@ -177,6 +177,9 @@ static void __devinit smp_store_cpu_info(int id) */ if ((c->x86_vendor == X86_VENDOR_AMD) && (c->x86 == 6)) { + if (num_possible_cpus() == 1) + goto valid_k7; + /* Athlon 660/661 is valid. */ if ((c->x86_model==6) && ((c->x86_mask==0) || (c->x86_mask==1))) goto valid_k7; |
