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/s390 | |
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/s390')
-rw-r--r-- | arch/linux/s390/processor.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/linux/s390/processor.h b/arch/linux/s390/processor.h index 604b3514..1648b917 100644 --- a/arch/linux/s390/processor.h +++ b/arch/linux/s390/processor.h @@ -36,8 +36,8 @@ computer_get_processor(void) tmp[1] = g_strstrip(tmp[1]); get_str("vendor_id", processor->vendor_id); - get_float("# processors", processor->processors); - get_int("bogomips per cpu", processor->bogomips); + get_int("# processors", processor->model); + get_float("bogomips per cpu", processor->bogomips); } g_strfreev(tmp); @@ -55,12 +55,15 @@ static gchar * processor_get_info(Processor *processor) { return g_strdup_printf("[Processor]\n" - "Processors=%d\n" + "Name=%s\n" + "Vendor=%s\n" "BogoMips per CPU=%.2f" + "Processors=%d\n" "Byte Order=%s\n", processor->model_name, - processor->processors, + processor->vendor_id, processor->bogomips, + processor->model, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" #else |