diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 02:37:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 02:37:23 -0500 |
| commit | 9d5432979951c8761c2b4517007039b9bcc1c110 (patch) | |
| tree | 9441cb1cd4a7674a2292936bfb42514f33d24cd4 /arch/i386/kernel/smpboot.c | |
| parent | a913829e90e2af7a6e98f5aadcc9fec4dcf1ef64 (diff) | |
| parent | 21e3024cbddb712f6a078bf4132d7682d3c4e35e (diff) | |
| download | linux-9d5432979951c8761c2b4517007039b9bcc1c110.tar.bz2 | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/i386/kernel/smpboot.c')
| -rw-r--r-- | arch/i386/kernel/smpboot.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 35bfe138cb1a..bc1bb6919e6a 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c @@ -1074,8 +1074,10 @@ static void __init smp_boot_cpus(unsigned int max_cpus) 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); + smp_num_siblings = siblings; + } if (c->x86_num_cores > 1) { for (i = 0; i < NR_CPUS; i++) { |