Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be5378f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils 

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils:
  cpupower: use man(1) when calling "cpupower help subcommand"
  cpupower: make NLS truly optional
  cpupower: fix Makefile typo
  cpupower: Make monitor command -c/--cpu aware
  cpupower: Better detect offlined CPUs
  cpupower: Do not show an empty Idle_Stats monitor if no idle driver is available
  cpupower: mperf monitor - Use TSC to calculate max frequency if possible
  cpupower: avoid using symlinks
parents e5b1d9cc 498ca793

tools/power/cpupower/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


# Set the following to `true' to make a unstripped, unoptimized

# binary. Leave this set to `false' for production use.

DEBUG ?=	false

DEBUG ?=	true



# make the build silent. Set this to something else to make it noisy again.

V ?=		false
@@ -35,7 +35,7 @@ NLS ?= true 


# Set the following to 'true' to build/install the

# cpufreq-bench benchmarking tool

CPUFRQ_BENCH ?= true

CPUFREQ_BENCH ?= true



# Prefix to the directories we're installing to

DESTDIR ?=
@@ -137,9 +137,10 @@ CFLAGS += -pipe 
ifeq ($(strip $(NLS)),true)

	INSTALL_NLS += install-gmo

	COMPILE_NLS += create-gmo

	CFLAGS += -DNLS

endif



ifeq ($(strip $(CPUFRQ_BENCH)),true)

ifeq ($(strip $(CPUFREQ_BENCH)),true)

	INSTALL_BENCH += install-bench

	COMPILE_BENCH += compile-bench

endif

tools/power/cpupower/debug/x86_64/Makefile

+4 −4
Original line number Diff line number Diff line 
default: all



centrino-decode: centrino-decode.c

	$(CC) $(CFLAGS) -o centrino-decode centrino-decode.c

centrino-decode: ../i386/centrino-decode.c

	$(CC) $(CFLAGS) -o $@ $<



powernow-k8-decode: powernow-k8-decode.c

	$(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c

powernow-k8-decode: ../i386/powernow-k8-decode.c

	$(CC) $(CFLAGS) -o $@ $<



all: centrino-decode powernow-k8-decode

tools/power/cpupower/debug/x86_64/centrino-decode.c

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../i386/centrino-decode.c
 
 No newline at end of file

tools/power/cpupower/debug/x86_64/powernow-k8-decode.c

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../i386/powernow-k8-decode.c
 
 No newline at end of file

tools/power/cpupower/man/cpupower-frequency-info.1

+3 −3
Original line number Diff line number Diff line 
.TH "cpufreq-info" "1" "0.1" "Mattia Dongili" ""

.TH "cpupower-frequency-info" "1" "0.1" "Mattia Dongili" ""

.SH "NAME"

.LP 

cpufreq\-info \- Utility to retrieve cpufreq kernel information

cpupower frequency\-info \- Utility to retrieve cpufreq kernel information

.SH "SYNTAX"

.LP 

cpufreq\-info [\fIoptions\fP]

cpupower [ \-c cpulist ] frequency\-info [\fIoptions\fP]

.SH "DESCRIPTION"

.LP 

A small tool which prints out cpufreq information helpful to developers and interested users.