x86/cpu: drop the num_siblings check against nr_cpu_ids
authorAndrew Cooper <andrew.cooper3@citrix.com>
Fri, 1 Aug 2014 14:32:39 +0000 (16:32 +0200)
committerJan Beulich <jbeulich@suse.com>
Fri, 1 Aug 2014 14:32:39 +0000 (16:32 +0200)
The printk() is missing a newline which resulted in console corruption.

However, nr_cpu_ids can be legitimately lower than valid num_sibling values
given certain compile or boot time configuration.

Suggested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
xen/arch/x86/cpu/common.c

index 5156df3105c5f061df3ac08541e6ac56063fd8b1..5c8d3c251e2d31b0fa40ea8826f43a7d0d5070ff 100644 (file)
@@ -443,13 +443,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
        if (c->x86_num_siblings == 1) {
                printk(KERN_INFO  "CPU: Hyper-Threading is disabled\n");
        } else if (c->x86_num_siblings > 1 ) {
-
-               if (c->x86_num_siblings > nr_cpu_ids) {
-                       printk(KERN_WARNING "CPU: Unsupported number of the siblings %d", c->x86_num_siblings);
-                       c->x86_num_siblings = 1;
-                       return;
-               }
-
                index_msb = get_count_order(c->x86_num_siblings);
                c->phys_proc_id = phys_pkg_id((ebx >> 24) & 0xFF, index_msb);