Description of problem:

See http://bugme.osdl.org/show_bug.cgi?id=4359

Steps to reproduce:

On an HP DL-360 or Sun Fire V60x (dual xeon systems)
  1. disable HT in the bios
  2. boot any smp kernel after 2.6.5 (didn't try UP kernel)
  3. /proc/cpuinfo shows 2 processors (phys ID 0 and 3) with 2 siblings

Expected behavior:
 /proc/cpuinfo should show 2 processors with 1 sibling each.

Additional info:

The x86_64 kernel already provides the following code to workaround
this issue. Please add it to the i386 kernel.

--- linux-2.6.6-1.435.2.3/arch/i386/kernel/smpboot.c.org	2005-03-19
06:56:51.123416256 -0800
+++ linux-2.6.6-1.435.2.3/arch/i386/kernel/smpboot.c	2005-03-19
06:59:01.884537544 -0800
@@ -1110,8 +1110,12 @@ static void __init smp_boot_cpus(unsigne
 			cpu_set(cpu, cpu_sibling_map[cpu]);
 		}
 
-		if (siblings != smp_num_siblings)
+		if (siblings != smp_num_siblings) {
 			printk(KERN_WARNING "WARNING: %d siblings found for CPU%d, should be %d\n",
siblings, cpu, smp_num_siblings);
+			printk(KERN_WARNING "WARNING: BIOS reporting wrong sibling count. Resetting
it to %d\n", siblings);
+			smp_num_siblings = siblings;
+		}
+
 	}
 
 	if (nmi_watchdog == NMI_LOCAL_APIC)