diff options
author | Chuck Ebbert <76306.1226@compuserve.com> | 2006-03-23 05:59:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 10:38:04 -0500 |
commit | 54a20f8c5d778ed3603130de4b92f64405228611 (patch) | |
tree | ced7969ecc3348c0aadd700e93c74449fd76b5ca /arch/i386 | |
parent | 30e931d4092713cecd6b8c2fd70f268efaa6e428 (diff) |
[PATCH] i386: fall back to sensible CPU model name
When vendor-specific i386 initialization code is unavailable the kernel
falls back to a default CPU model name. Make that model name reflect the
CPU family instead of an internal vendor index.
Tested on Pentium II (family 6 model 5).
/proc/cpuinfo before:
model name : ff/05
after:
model name : 06/05
Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Acked-by: "Seth, Rohit" <rohit.seth@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/cpu/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c index bbfc278dfa49..7e3d6b6a4e96 100644 --- a/arch/i386/kernel/cpu/common.c +++ b/arch/i386/kernel/cpu/common.c | |||
@@ -430,7 +430,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) | |||
430 | else | 430 | else |
431 | /* Last resort... */ | 431 | /* Last resort... */ |
432 | sprintf(c->x86_model_id, "%02x/%02x", | 432 | sprintf(c->x86_model_id, "%02x/%02x", |
433 | c->x86_vendor, c->x86_model); | 433 | c->x86, c->x86_model); |
434 | } | 434 | } |
435 | 435 | ||
436 | /* Now the feature flags better reflect actual CPU features! */ | 436 | /* Now the feature flags better reflect actual CPU features! */ |