diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-08-10 16:48:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-10 16:48:51 -0700 |
| commit | b9157b3f6520f46e788157fbfe9753b209efe9b7 (patch) | |
| tree | 80d72e25837f3b569734ba476df84d3462617e29 /modules/devices/x86/processor.c | |
| parent | 7db082583f72598e2118553faf1ba3206d7c3ee7 (diff) | |
| parent | 4827b88fa34807425640d2a9f07bbf4ac4119ab3 (diff) | |
Merge branch 'master' into usb3
Diffstat (limited to 'modules/devices/x86/processor.c')
| -rw-r--r-- | modules/devices/x86/processor.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c index 768a70fa..538206c1 100644 --- a/modules/devices/x86/processor.c +++ b/modules/devices/x86/processor.c @@ -19,7 +19,7 @@ #include "hardinfo.h" #include "devices.h" #include "cpu_util.h" - +#include "nice_name.h" #include "x86_data.h" #include "x86_data.c" @@ -567,6 +567,8 @@ GSList *processor_scan(void) if (processor->cpufreq->cpukhz_max) processor->cpu_mhz = processor->cpufreq->cpukhz_max / 1000; + + nice_name_x86_cpuid_model_string(processor->model_name); } return procs; @@ -648,7 +650,7 @@ gchar *processor_get_detailed_info(Processor * processor) processor->model, processor->stepping, processor->strmodel, - _("Vendor"), idle_free(vendor_get_link(processor->vendor_id)), + _("Vendor"), (char*)idle_free(vendor_get_link(processor->vendor_id)), _("Microcode Version"), processor->microcode, _("Configuration"), _("Cache Size"), processor->cache_size, _("kb"), |