Commit 0db699f7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'linux-cpupower-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux 

Pull cpupower utility updates for 4.20-rc4 from Shuah Khan:

"This cpupower update for Linux 4.20-rc4 consists of compile fixes to allow
 use of outside build flags and override of CFLAGS from Jiri Olsa, and fix
 to compilation with STATIC=true from Konstantin Khlebnikov."

* tag 'linux-cpupower-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  tools cpupower: Override CFLAGS assignments
  tools cpupower debug: Allow to use outside build flags
  tools/power/cpupower: fix compilation with STATIC=true
parents 9ff01193 dbc4ca33

tools/power/cpupower/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ WARNINGS += $(call cc-supports,-Wno-pointer-sign) 
WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)

WARNINGS += -Wshadow



CFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \

override CFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \

		-DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE



UTIL_OBJS =  utils/helpers/amd.o utils/helpers/msr.o \
@@ -156,12 +156,12 @@ LIB_SRC = lib/cpufreq.c lib/cpupower.c lib/cpuidle.c 
LIB_OBJS = 	lib/cpufreq.o lib/cpupower.o lib/cpuidle.o

LIB_OBJS :=	$(addprefix $(OUTPUT),$(LIB_OBJS))



CFLAGS +=	-pipe

override CFLAGS +=	-pipe



ifeq ($(strip $(NLS)),true)

	INSTALL_NLS += install-gmo

	COMPILE_NLS += create-gmo

	CFLAGS += -DNLS

	override CFLAGS += -DNLS

endif



ifeq ($(strip $(CPUFREQ_BENCH)),true)
@@ -175,7 +175,7 @@ ifeq ($(strip $(STATIC)),true) 
        UTIL_SRC += $(LIB_SRC)

endif



CFLAGS += $(WARNINGS)

override CFLAGS += $(WARNINGS)



ifeq ($(strip $(V)),false)

	QUIET=@
@@ -188,10 +188,10 @@ export QUIET ECHO 


# if DEBUG is enabled, then we do not strip or optimize

ifeq ($(strip $(DEBUG)),true)

	CFLAGS += -O1 -g -DDEBUG

	override CFLAGS += -O1 -g -DDEBUG

	STRIPCMD = /bin/true -Since_we_are_debugging

else

	CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer

	override CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer

	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment

endif

tools/power/cpupower/bench/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ endif 
ifeq ($(strip $(STATIC)),true)

LIBS = -L../ -L$(OUTPUT) -lm

OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o \

       $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/sysfs.o

       $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/cpupower.o

else

LIBS = -L../ -L$(OUTPUT) -lm -lcpupower

OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o

tools/power/cpupower/debug/x86_64/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ INSTALL = /usr/bin/install 
default: all



$(OUTPUT)centrino-decode: ../i386/centrino-decode.c

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

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



$(OUTPUT)powernow-k8-decode: ../i386/powernow-k8-decode.c

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

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



all: $(OUTPUT)centrino-decode $(OUTPUT)powernow-k8-decode

tools/power/cpupower/lib/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static unsigned int sysfs_cpufreq_read_file(unsigned int cpu, const char *fname, 


	snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/cpufreq/%s",

			 cpu, fname);

	return sysfs_read_file(path, buf, buflen);

	return cpupower_read_sysfs(path, buf, buflen);

}



/* helper function to write a new value to a /sys file */

tools/power/cpupower/lib/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static unsigned int sysfs_cpuidle_read_file(const char *fname, char *buf, 


	snprintf(path, sizeof(path), PATH_TO_CPU "cpuidle/%s", fname);



	return sysfs_read_file(path, buf, buflen);

	return cpupower_read_sysfs(path, buf, buflen);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE