| Message ID | d34df2fe-3f33-2716-6a29-8f66656edf8a@osg.samsung.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi, On Thu, Nov 9, 2017 at 9:10 PM, Shuah Khan <shuahkh@osg.samsung.com> wrote: > Hi Rafael, > > Please pull the cpupower update for 4.15-rc1 > > This update consists of fixes to the MHz frequency output and > adding 64-bit library detection. > > Diff is attached. > > These patches have been in linux-next for a few days. I had to fix > commit lines longer than 75 chars in one of the commits and fixed > this morning. Pulled, thanks! > Please let me know if you would like any changes in the work-flow > and the pull request. All is fine, thanks. Rafael
diff --git a/tools/power/cpupower/.gitignore b/tools/power/cpupower/.gitignore index d42073f12609..1f9977cc609c 100644 --- a/tools/power/cpupower/.gitignore +++ b/tools/power/cpupower/.gitignore @@ -1,7 +1,6 @@ .libs libcpupower.so -libcpupower.so.0 -libcpupower.so.0.0.0 +libcpupower.so.* build/ccdv cpufreq-info cpufreq-set diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index d6e1c02ddcfe..da205d1fa03c 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile @@ -30,6 +30,8 @@ OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd) $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist)) endif +include ../../scripts/Makefile.arch + # --- CONFIGURATION BEGIN --- # Set the following to `true' to make a unstripped, unoptimized @@ -79,7 +81,11 @@ bindir ?= /usr/bin sbindir ?= /usr/sbin mandir ?= /usr/man includedir ?= /usr/include +ifeq ($(IS_64_BIT), 1) +libdir ?= /usr/lib64 +else libdir ?= /usr/lib +endif localedir ?= /usr/share/locale docdir ?= /usr/share/doc/packages/cpupower confdir ?= /etc/ diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c index 3e701f0e9c14..df43cd45d810 100644 --- a/tools/power/cpupower/utils/cpufreq-info.c +++ b/tools/power/cpupower/utils/cpufreq-info.c @@ -93,8 +93,6 @@ static void print_speed(unsigned long speed) if (speed > 1000000) printf("%u.%06u GHz", ((unsigned int) speed/1000000), ((unsigned int) speed%1000000)); - else if (speed > 100000) - printf("%u MHz", (unsigned int) speed); else if (speed > 1000) printf("%u.%03u MHz", ((unsigned int) speed/1000), (unsigned int) (speed%1000));
Hi Rafael, Please pull the cpupower update for 4.15-rc1 This update consists of fixes to the MHz frequency output and adding 64-bit library detection. Diff is attached. These patches have been in linux-next for a few days. I had to fix commit lines longer than 75 chars in one of the commits and fixed this morning. Please let me know if you would like any changes in the work-flow and the pull request. thanks, -- Shuah -------------------------------------------------------------- The following changes since commit 0b07194bb55ed836c2cc7c22e866b87a14681984: Linux 4.14-rc7 (2017-10-29 13:58:38 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-4.15-rc1 for you to fetch changes up to 69b6f8a9b7961efd7dcc11ab9b1d5be55ed8a15e: tools/power/cpupower: add libcpupower.so.0.0.1 to .gitignore (2017-11-09 10:52:22 -0700) ---------------------------------------------------------------- linux-cpupower-4.15-rc1 This cpupower update consists of fixes to the MHz frequency output and adding 64-bit library detection. ---------------------------------------------------------------- Prarit Bhargava (3): cpupower: Fix no-rounding MHz frequency output tools/power/cpupower: Add 64 bit library detection tools/power/cpupower: add libcpupower.so.0.0.1 to .gitignore tools/power/cpupower/.gitignore | 3 +-- tools/power/cpupower/Makefile | 6 ++++++ tools/power/cpupower/utils/cpufreq-info.c | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) --------------------------------------------------------------