summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-02-22 17:41:54 -0500
committerDave Jones <davej@redhat.com>2011-02-22 17:41:54 -0500
commit1c3af63583b7679612a0490d5e7be2d847ed646a (patch)
treef6c1a54e3d52589b342f4c39915d776df5996c2c
parentaa4db53a35f7fc23f84169e032fef5fb626f1576 (diff)
print out the BIOS programmed string by default too.
Also clarify which is x86info's guess.
-rw-r--r--get_model_name.c2
-rw-r--r--identify.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/get_model_name.c b/get_model_name.c
index f2db7ea..109cfe2 100644
--- a/get_model_name.c
+++ b/get_model_name.c
@@ -125,5 +125,5 @@ void get_model_name(struct cpudata *cpu)
}
}
- printf("Processor name string: %s\n", cp);
+ printf("Processor name string (BIOS programmed): %s\n", cp);
}
diff --git a/identify.c b/identify.c
index aefc896..578228e 100644
--- a/identify.c
+++ b/identify.c
@@ -98,13 +98,13 @@ void show_info(struct cpudata *cpu)
printf("EFamily: %u EModel: %u Family: %u Model: %u Stepping: %u\n",
cpu->efamily, cpu->emodel, cpu->family,
model(cpu), cpu->stepping);
- printf("CPU Model: %s\n", cpu->name);
+ printf("CPU Model (x86info's best guess): %s\n", cpu->name);
+ get_model_name(cpu);
+ printf("\n");
if (!verbose)
return;
- get_model_name(cpu);
-
switch (cpu->vendor) {
case VENDOR_AMD:
display_AMD_info(cpu);