[GIT PULL] cpupower update for Linux 6.8-rc2

[Shuah Khan <skhan@linuxfoundation.org>]

[-- Attachment #1: Type: text/plain, Size: 1555 bytes --]

Hi Rafael,

Please pull the following cpupower fixes update for Linux 6.8-rc2.

Please include it in your next pull if you already sent your
PR.

This cpupower fixes update for Linux 6.8-rc2 consists of one single fix
to an issue where CFLAGS is passed as a make argument for cpupower, but
bench makefile does not inherit and append to them.

This fixes the problem so the user specified CFLAGS are honored.

diff is attached.

----------------------------------------------------------------

--The following changes since commit 6613476e225e090cc9aad49be7fa504e290dd33d:

   Linux 6.8-rc1 (2024-01-21 14:11:32 -0800)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-6.8-rc2

for you to fetch changes up to 0086ffec768bec6f5d61fc7e406af640eb912a24:

   tools cpupower bench: Override CFLAGS assignments (2024-01-21 16:57:51 -0700)

----------------------------------------------------------------
linux-cpupower-6.8-rc2

This cpupower fixes update for Linux 6.8-rc2 consists of one single fix
to an issue where CFLAGS is passed as a make argument for cpupower, but
bench makefile does not inherit and append to them.

This fixes the problem so the user specified CFLAGS are honored.

----------------------------------------------------------------
Stanley Chan (1):
       tools cpupower bench: Override CFLAGS assignments

  tools/power/cpupower/bench/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
--------------------------------------------------------------

[-- Attachment #2: linux-cpupower-6.8-rc2.diff --]
[-- Type: text/x-patch, Size: 595 bytes --]

diff --git a/tools/power/cpupower/bench/Makefile b/tools/power/cpupower/bench/Makefile
index d9d9923af85c..a4b902f9e1c4 100644
--- a/tools/power/cpupower/bench/Makefile
+++ b/tools/power/cpupower/bench/Makefile
@@ -15,7 +15,7 @@ LIBS = -L../ -L$(OUTPUT) -lm -lcpupower
 OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o
 endif
 
-CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\"
+override CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\"
 
 $(OUTPUT)%.o : %.c
 	$(ECHO) "  CC      " $@