diff options
| author | Agney Lopes Roth Ferraz <agney@debian.org> | 2006-12-11 20:40:14 -0200 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:39 -0500 |
| commit | 52b64143c544fc1de7efa32d100221adfdfa40f1 (patch) | |
| tree | cd57fbbf9ca071eae28858631fa76e69971f7cfe /arch/linux/ia64 | |
| parent | 0bc4fab4f6b85b7eef2898aff2ab39f8d0282404 (diff) | |
Import Debian changes 0.4.1-7
hardinfo (0.4.1-7) unstable; urgency=low
* Fixed FTBFS on s390, ia64 and alpha.
Diffstat (limited to 'arch/linux/ia64')
| -rw-r--r-- | arch/linux/ia64/processor.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h index 9cbc3377..3ce679ce 100644 --- a/arch/linux/ia64/processor.h +++ b/arch/linux/ia64/processor.h @@ -35,19 +35,18 @@ computer_get_processor(void) tmp[0] = g_strstrip(tmp[0]); tmp[1] = g_strstrip(tmp[1]); - get_str("vendor", processor->vendor); - get_str("arch", processor->arch); + get_str("vendor", processor->vendor_id); + get_str("arch", processor->model); get_str("family", processor->family); - get_str("features", processor->features); - get_str("cpu MHz", processor->cpu_mhz); - get_str("itc MHz", processor->itc_mhz); + get_str("features", processor->flags); + get_float("cpu MHz", processor->cpu_mhz); get_float("BogoMIPS", processor->bogomips); } g_strfreev(tmp); } - gchar *tmp = g_strconcat(processor->vendor, processor->arch, NULL); + gchar *tmp = g_strconcat(processor->vendor_id, processor->model, NULL); g_free(processor->vendor); g_free(processor->arch); processor->model_name = tmp; @@ -61,17 +60,16 @@ static gchar * processor_get_info(Processor *processor) { return g_strdup_printf("[Processor]\n" + "Name=%s\n" "Family=%s\n" "Features=%.2f\n" "CPU Mhz=%.2fMHz\n" - "ITC MHz=%.2f" - "BogoMips=%.2f" + "BogoMips=%.2f" "Byte Order=%s\n", processor->model_name, - processor->family; - processor->features, + processor->family, + processor->flags, processor->cpu_mhz, - processor->itc_mhz, processor->bogomips, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" |