openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'linux-cpupower-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux into pm-tools

Browse Source 
Pull cpupower utility changes for v4.15 from Shuah Khan.

This cpupower update consists of fixes to the MHz frequency output and
adding 64-bit library detection.

* tag 'linux-cpupower-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  tools/power/cpupower: add libcpupower.so.0.0.1 to .gitignore
  tools/power/cpupower: Add 64 bit library detection
  cpupower: Fix no-rounding MHz frequency output
This commit is contained in:
Rafael J. Wysocki
2017-11-09 23:33:43 +01:00
parent 10f2fe6efa 69b6f8a9b7
commit be89251d63
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/power/cpupower/.gitignore vendored
View File

@ -1,7 +1,6 @@
.libs .libs
libcpupower.so libcpupower.so
libcpupower.so.0 libcpupower.so.*
libcpupower.so.0.0.0
build/ccdv build/ccdv
cpufreq-info cpufreq-info
cpufreq-set cpufreq-set

6
tools/power/cpupower/Makefile
View File

@ -30,6 +30,8 @@ OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist)) $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
endif endif
include ../../scripts/Makefile.arch
# --- CONFIGURATION BEGIN --- # --- CONFIGURATION BEGIN ---
# Set the following to `true' to make a unstripped, unoptimized # Set the following to `true' to make a unstripped, unoptimized
@ -79,7 +81,11 @@ bindir ?= /usr/bin
sbindir ?= /usr/sbin sbindir ?= /usr/sbin
mandir ?= /usr/man mandir ?= /usr/man
includedir ?= /usr/include includedir ?= /usr/include
ifeq ($(IS_64_BIT), 1)
libdir ?= /usr/lib64
else
libdir ?= /usr/lib libdir ?= /usr/lib
endif
localedir ?= /usr/share/locale localedir ?= /usr/share/locale
docdir ?= /usr/share/doc/packages/cpupower docdir ?= /usr/share/doc/packages/cpupower
confdir ?= /etc/ confdir ?= /etc/

2
tools/power/cpupower/utils/cpufreq-info.c
View File

@ -93,8 +93,6 @@ static void print_speed(unsigned long speed)
if (speed > 1000000) if (speed > 1000000)
printf("%u.%06u GHz", ((unsigned int) speed/1000000), printf("%u.%06u GHz", ((unsigned int) speed/1000000),
((unsigned int) speed%1000000)); ((unsigned int) speed%1000000));
else if (speed > 100000)
printf("%u MHz", (unsigned int) speed);
else if (speed > 1000) else if (speed > 1000)
printf("%u.%03u MHz", ((unsigned int) speed/1000), printf("%u.%03u MHz", ((unsigned int) speed/1000),
(unsigned int) (speed%1000)); (unsigned int) (speed%1000));