git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
common.c
diff --git
a/arch/i386/kernel/cpu/common.c
b/arch/i386/kernel/cpu/common.c
index
fbb6a59
..
30e25e3
100644
(file)
--- a/
arch/i386/kernel/cpu/common.c
+++ b/
arch/i386/kernel/cpu/common.c
@@
-329,7
+329,7
@@
void __init identify_cpu(struct cpuinfo_x86 *c)
generic_identify(c);
generic_identify(c);
- printk(KERN_DEBUG "CPU:
After generic identify, caps: %08lx %08lx %08lx %08lx\n",
+ printk(KERN_DEBUG "CPU: After generic identify, caps: %08lx %08lx %08lx %08lx\n",
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
@@
-338,7
+338,7
@@
void __init identify_cpu(struct cpuinfo_x86 *c)
if (this_cpu->c_identify) {
this_cpu->c_identify(c);
if (this_cpu->c_identify) {
this_cpu->c_identify(c);
- printk(KERN_DEBUG "CPU:
After vendor identify, caps:
%08lx %08lx %08lx %08lx\n",
+ printk(KERN_DEBUG "CPU:
After vendor identify, caps:
%08lx %08lx %08lx %08lx\n",
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
@@
-393,7
+393,7
@@
void __init identify_cpu(struct cpuinfo_x86 *c)
/* Now the feature flags better reflect actual CPU features! */
/* Now the feature flags better reflect actual CPU features! */
- printk(KERN_DEBUG "CPU:
After all inits, caps:
%08lx %08lx %08lx %08lx\n",
+ printk(KERN_DEBUG "CPU:
After all inits, caps:
%08lx %08lx %08lx %08lx\n",
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
c->x86_capability[0],
c->x86_capability[1],
c->x86_capability[2],
@@
-473,7
+473,6
@@
void early_cpu_detect(void);
void __init early_cpu_init(void)
{
void __init early_cpu_init(void)
{
- early_cpu_detect();
intel_cpu_init();
cyrix_init_cpu();
nsc_init_cpu();
intel_cpu_init();
cyrix_init_cpu();
nsc_init_cpu();
@@
-483,6
+482,7
@@
void __init early_cpu_init(void)
rise_init_cpu();
nexgen_init_cpu();
umc_init_cpu();
rise_init_cpu();
nexgen_init_cpu();
umc_init_cpu();
+ early_cpu_detect();
#ifdef CONFIG_DEBUG_PAGEALLOC
/* pse is not compatible with on-the-fly unmapping,
#ifdef CONFIG_DEBUG_PAGEALLOC
/* pse is not compatible with on-the-fly unmapping,