projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
78b1a7a
)
Turbostat: Fix minor compilation warnings
author
Vincent Brillault
<git@lerya.net>
Sat, 20 Sep 2014 07:55:10 +0000
(09:55 +0200)
committer
Vincent Brillault
<git@lerya.net>
Sat, 28 Feb 2015 06:35:41 +0000
(07:35 +0100)
src/turbostat.c
patch
|
blob
|
history
diff --git
a/src/turbostat.c
b/src/turbostat.c
index
f7b0b1d
..
482ec5e
100644
(file)
--- a/
src/turbostat.c
+++ b/
src/turbostat.c
@@
-1175,6
+1175,7
@@
probe_cpu()
*
* This check is valid for both Intel and AMD
*/
*
* This check is valid for both Intel and AMD
*/
+ eax = ebx = ecx = edx = 0;
__get_cpuid(0x80000007, &eax, &ebx, &ecx, &edx);
if (!(edx & (1 << 8))) {
ERROR("No invariant TSC");
__get_cpuid(0x80000007, &eax, &ebx, &ecx, &edx);
if (!(edx & (1 << 8))) {
ERROR("No invariant TSC");
@@
-1193,6
+1194,7
@@
probe_cpu()
*
* This check is valid for both Intel and AMD
*/
*
* This check is valid for both Intel and AMD
*/
+ eax = ebx = ecx = edx = 0;
__get_cpuid(0x6, &eax, &ebx, &ecx, &edx);
do_dts = eax & (1 << 0);
do_ptm = eax & (1 << 6);
__get_cpuid(0x6, &eax, &ebx, &ecx, &edx);
do_dts = eax & (1 << 0);
do_ptm = eax & (1 << 6);
@@
-1299,7
+1301,7
@@
probe_cpu()
}
if (do_rapl) {
}
if (do_rapl) {
- unsigned long msr;
+ unsigned long
long
msr;
if (get_msr(0, MSR_RAPL_POWER_UNIT, &msr))
return 0;
if (get_msr(0, MSR_RAPL_POWER_UNIT, &msr))
return 0;