Skip to content

Commit

Permalink
x86: Fix cpu_devs[] initialization in early_cpu_init()
Browse files Browse the repository at this point in the history
Yinghai Lu noticed that this commit:

  0388423: x86: Minimise printk spew from per-vendor init code

mistakenly left out the initialization of cpu_devs[] in the
!PROCESSOR_SELECT case. Fix it.

Reported-by: Yinghai Lu <yinghai@kernel.org>
Cc: Dave Jones <davej@redhat.com>
LKML-Reference: <20091113203000.GA19160@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Nov 14, 2009
1 parent b01c845 commit 31c997c
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions arch/x86/kernel/cpu/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -651,28 +651,34 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)

void __init early_cpu_init(void)
{
#ifdef PROCESSOR_SELECT
const struct cpu_dev *const *cdev;
int count = 0;

#ifdef PROCESSOR_SELECT
printk(KERN_INFO "KERNEL supported cpus:\n");
#endif

for (cdev = __x86_cpu_dev_start; cdev < __x86_cpu_dev_end; cdev++) {
const struct cpu_dev *cpudev = *cdev;
unsigned int j;

if (count >= X86_VENDOR_NUM)
break;
cpu_devs[count] = cpudev;
count++;

for (j = 0; j < 2; j++) {
if (!cpudev->c_ident[j])
continue;
printk(KERN_INFO " %s %s\n", cpudev->c_vendor,
cpudev->c_ident[j]);
#ifdef PROCESSOR_SELECT
{
unsigned int j;

for (j = 0; j < 2; j++) {
if (!cpudev->c_ident[j])
continue;
printk(KERN_INFO " %s %s\n", cpudev->c_vendor,
cpudev->c_ident[j]);
}
}
}
#endif
}
early_identify_cpu(&boot_cpu_data);
}

Expand Down

0 comments on commit 31c997c

Please sign in to comment.