diff options
| author | Agney Lopes Roth Ferraz <agney@debian.org> | 2006-12-12 09:30:53 -0300 | 
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:40 -0500 | 
| commit | 2b76ad81f894cfcbdc897eb33a6e92ae74f81162 (patch) | |
| tree | cd5cd8ebdef4e77a904746c87f0931d8c15d4709 /arch/linux/ia64 | |
| parent | 52b64143c544fc1de7efa32d100221adfdfa40f1 (diff) | |
Import Debian changes 0.4.1-8
hardinfo (0.4.1-8) unstable; urgency=low
  * Fixed errors on processor.h on ia64 and alpha. 
Diffstat (limited to 'arch/linux/ia64')
| -rw-r--r-- | arch/linux/ia64/processor.h | 13 | 
1 files changed, 5 insertions, 8 deletions
| diff --git a/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h index 3ce679ce..6359ba36 100644 --- a/arch/linux/ia64/processor.h +++ b/arch/linux/ia64/processor.h @@ -36,8 +36,8 @@ computer_get_processor(void)  	    tmp[1] = g_strstrip(tmp[1]);  	    get_str("vendor", processor->vendor_id); -	    get_str("arch", processor->model); -	    get_str("family", processor->family); +	    get_str("arch", processor->bug_fdiv); +	    get_str("family", processor->has_fpu);  	    get_str("features", processor->flags);  	    get_float("cpu MHz", processor->cpu_mhz);  	    get_float("BogoMIPS", processor->bogomips); @@ -46,11 +46,8 @@ computer_get_processor(void)  	g_strfreev(tmp);      } -    gchar *tmp = g_strconcat(processor->vendor_id, processor->model, NULL); -    g_free(processor->vendor); -    g_free(processor->arch); +    gchar *tmp = g_strconcat(processor->vendor_id, processor->bug_fdiv, NULL);      processor->model_name = tmp; -      fclose(cpuinfo);      return processor; @@ -62,12 +59,12 @@ processor_get_info(Processor *processor)  	return g_strdup_printf("[Processor]\n"  						   "Name=%s\n"  	                       "Family=%s\n" -	                       "Features=%.2f\n" +	                       "Features=%s\n"  	                       "CPU Mhz=%.2fMHz\n"  			               "BogoMips=%.2f"  	                       "Byte Order=%s\n",  			       processor->model_name, -			       processor->family, +			       processor->has_fpu,  			       processor->flags,  			       processor->cpu_mhz,  			       processor->bogomips, | 
