selftests/futex: fix build for clang
Subsystems (3)
Sasha Levin
maintainerPATCH 1/2 selftests/futex: fix build for clang
From: Ricardo Cañuelo <[email protected]>
[ Upstream commit 03cab65a07e083b6c1010fbc8f9b817e9aca75d9 ]
Don't use the test-specific header files as source files to force a target dependency, as clang will complain if more than one source file is used for a compile command with a single '-o' flag.
Use the proper Makefile variables instead as defined in tools/testing/selftests/lib.mk.
Signed-off-by Ricardo Cañuelo <[email protected]>
Reviewed-by André Almeida <[email protected]>
Signed-off-by Shuah Khan <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
--- tools/testing/selftests/futex/functional/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
tools/testing/selftests/futex/functional/Makefile +2 -4
@@ -3,11 +3,11 @@ INCLUDES := -I../include -I../../ CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) LDFLAGS := $(LDFLAGS) -pthread -lrt -HEADERS := \ +LOCAL_HDRS := \ ../include/futextest.h \ ../include/atomic.h \ ../include/logging.h -TEST_GEN_FILES := \ +TEST_GEN_PROGS := \ futex_wait_timeout \ futex_wait_wouldblock \ futex_requeue_pi \
@@ -19,5 +19,3 @@ TEST_GEN_FILES := \ TEST_PROGS := run.sh include ../../lib.mk - -$(TEST_GEN_FILES): $(HEADERS)
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 2/2 rtc: cmos: fix build on non-ACPI platforms
From: Alexandre Belloni <[email protected]>
[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ]
Now that rtc_wake_setup is called outside of cmos_wake_setup, it also need to be defined on non-ACPI platforms.
Reported-by kernel test robot <[email protected]>
Signed-off-by Alexandre Belloni <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
--- drivers/rtc/rtc-cmos.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/rtc/rtc-cmos.c +3 -0
@@ -1189,6 +1189,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev, { } +static void rtc_wake_setup (struct device *dev) +{ +}#endif #ifdef CONFIG_PNP
Signature · 1 line
2.35.1