* [patch] cpu_early_init() breakage
@ 2009-11-14 12:43 Mike Galbraith
2009-11-14 13:06 ` Mike Galbraith
0 siblings, 1 reply; 3+ messages in thread
From: Mike Galbraith @ 2009-11-14 12:43 UTC (permalink / raw)
To: Ingo Molnar, Dave Jones; +Cc: LKML
0388423 typo caused loss of vendor data even with CONFIG_PROCESSOR_SELECT.
[ 0.000000] CPU: vendor_id 'GenuineIntel' unknown, using generic init.
[ 0.000000] CPU: Your system may be unstable.
[ 0.044003] MCE: unknown CPU type - not enabling MCE support.
...
[ 0.437241] Brought up 4 CPUs
[ 0.440002] Total of 4 processors activated (19139.97 BogoMIPS).
[ 0.448021] CPU0 attaching sched-domain:
[ 0.448024] domain 0: span 0-3 level MC
[ 0.448026] groups: 0 1 2 3
[ 0.448031] CPU1 attaching sched-domain:
[ 0.448033] domain 0: span 0-3 level MC
[ 0.448035] groups: 1 2 3 0
[ 0.448039] CPU2 attaching sched-domain:
[ 0.448041] domain 0: span 0-3 level MC
[ 0.448043] groups: 2 3 0 1
[ 0.448047] CPU3 attaching sched-domain:
[ 0.448048] domain 0: span 0-3 level MC
[ 0.448050] groups: 3 0 1 2
x86: Fix typo in 0388423 "Minimise printk spew from per-vendor init code"
Signed-off-by: Mike Galbraith <efault@gmx.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Dave Jones <davej@redhat.com>
LKML-Reference: <new-submission>
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 973080b..3c7f7fd 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -651,11 +651,12 @@ 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 CONFIG_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;
@@ -668,11 +669,12 @@ void __init early_cpu_init(void)
for (j = 0; j < 2; j++) {
if (!cpudev->c_ident[j])
continue;
+#ifdef CONFIG_PROCESSOR_SELECT
printk(KERN_INFO " %s %s\n", cpudev->c_vendor,
cpudev->c_ident[j]);
+#endif
}
}
-#endif
early_identify_cpu(&boot_cpu_data);
}
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] cpu_early_init() breakage
2009-11-14 12:43 [patch] cpu_early_init() breakage Mike Galbraith
@ 2009-11-14 13:06 ` Mike Galbraith
2009-11-15 8:05 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Mike Galbraith @ 2009-11-14 13:06 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Dave Jones, LKML
Bah, missed quilt refresh after fixing my own typo :)
0388423 typo caused loss of vendor data even with CONFIG_PROCESSOR_SELECT.
[ 0.000000] CPU: vendor_id 'GenuineIntel' unknown, using generic init.
[ 0.000000] CPU: Your system may be unstable.
[ 0.044003] MCE: unknown CPU type - not enabling MCE support.
...
[ 0.437241] Brought up 4 CPUs
[ 0.440002] Total of 4 processors activated (19139.97 BogoMIPS).
[ 0.448021] CPU0 attaching sched-domain:
[ 0.448024] domain 0: span 0-3 level MC
[ 0.448026] groups: 0 1 2 3
[ 0.448031] CPU1 attaching sched-domain:
[ 0.448033] domain 0: span 0-3 level MC
[ 0.448035] groups: 1 2 3 0
[ 0.448039] CPU2 attaching sched-domain:
[ 0.448041] domain 0: span 0-3 level MC
[ 0.448043] groups: 2 3 0 1
[ 0.448047] CPU3 attaching sched-domain:
[ 0.448048] domain 0: span 0-3 level MC
[ 0.448050] groups: 3 0 1 2
x86: Fix typo in 0388423 "Minimise printk spew from per-vendor init code"
Signed-off-by: Mike Galbraith <efault@gmx.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Dave Jones <davej@redhat.com>
LKML-Reference: <new-submission>
---
arch/x86/kernel/cpu/common.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Index: linux-2.6/arch/x86/kernel/cpu/common.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/cpu/common.c
+++ linux-2.6/arch/x86/kernel/cpu/common.c
@@ -651,11 +651,12 @@ static void __init early_identify_cpu(st
void __init early_cpu_init(void)
{
-#ifdef PROCESSOR_SELECT
const struct cpu_dev *const *cdev;
int count = 0;
+#ifdef CONFIG_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;
@@ -665,14 +666,15 @@ void __init early_cpu_init(void)
cpu_devs[count] = cpudev;
count++;
+#ifdef CONFIG_PROCESSOR_SELECT
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);
}
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] cpu_early_init() breakage
2009-11-14 13:06 ` Mike Galbraith
@ 2009-11-15 8:05 ` Ingo Molnar
0 siblings, 0 replies; 3+ messages in thread
From: Ingo Molnar @ 2009-11-15 8:05 UTC (permalink / raw)
To: Mike Galbraith; +Cc: Dave Jones, LKML
* Mike Galbraith <efault@gmx.de> wrote:
> Bah, missed quilt refresh after fixing my own typo :)
>
> 0388423 typo caused loss of vendor data even with CONFIG_PROCESSOR_SELECT.
>
> [ 0.000000] CPU: vendor_id 'GenuineIntel' unknown, using generic init.
> [ 0.000000] CPU: Your system may be unstable.
> [ 0.044003] MCE: unknown CPU type - not enabling MCE support.
> ...
> [ 0.437241] Brought up 4 CPUs
> [ 0.440002] Total of 4 processors activated (19139.97 BogoMIPS).
> [ 0.448021] CPU0 attaching sched-domain:
> [ 0.448024] domain 0: span 0-3 level MC
> [ 0.448026] groups: 0 1 2 3
> [ 0.448031] CPU1 attaching sched-domain:
> [ 0.448033] domain 0: span 0-3 level MC
> [ 0.448035] groups: 1 2 3 0
> [ 0.448039] CPU2 attaching sched-domain:
> [ 0.448041] domain 0: span 0-3 level MC
> [ 0.448043] groups: 2 3 0 1
> [ 0.448047] CPU3 attaching sched-domain:
> [ 0.448048] domain 0: span 0-3 level MC
> [ 0.448050] groups: 3 0 1 2
>
> x86: Fix typo in 0388423 "Minimise printk spew from per-vendor init code"
>
> Signed-off-by: Mike Galbraith <efault@gmx.de>
> Cc: Ingo Molnar <mingo@elte.hu>
> Cc: Dave Jones <davej@redhat.com>
> LKML-Reference: <new-submission>
>
> ---
> arch/x86/kernel/cpu/common.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/arch/x86/kernel/cpu/common.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/cpu/common.c
> +++ linux-2.6/arch/x86/kernel/cpu/common.c
> @@ -651,11 +651,12 @@ static void __init early_identify_cpu(st
>
> void __init early_cpu_init(void)
> {
> -#ifdef PROCESSOR_SELECT
> const struct cpu_dev *const *cdev;
> int count = 0;
>
> +#ifdef CONFIG_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;
> @@ -665,14 +666,15 @@ void __init early_cpu_init(void)
> cpu_devs[count] = cpudev;
> count++;
>
> +#ifdef CONFIG_PROCESSOR_SELECT
> 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
i did the same fix yesterday - could you check latest -tip whether it
works for you too?
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-15 8:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-14 12:43 [patch] cpu_early_init() breakage Mike Galbraith
2009-11-14 13:06 ` Mike Galbraith
2009-11-15 8:05 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®