Commit 21c92498 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-fixes-6.1-rc3' of... 

Merge tag 'linux-kselftest-fixes-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest fixes from Shuah Khan:

 - futex, intel_pstate, kexec build fixes

 - ftrace dynamic_events dependency check fix

 - memory-hotplug fix to remove redundant warning from test report

* tag 'linux-kselftest-fixes-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/ftrace: fix dynamic_events dependency check
  selftests/memory-hotplug: Remove the redundant warning information
  selftests/kexec: fix build for ARCH=x86_64
  selftests/intel_pstate: fix build for ARCH=x86_64
  selftests/futex: fix build for clang
parents 74d5b415 cb05c81a

tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0

# description: Generic dynamic event - check if duplicate events are caught

# requires: dynamic_events "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README

# requires: dynamic_events "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README



echo 0 > events/enable

tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0

# description: event trigger - test inter-event histogram trigger eprobe on synthetic event

# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README

# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README



echo 0 > events/enable

tools/testing/selftests/futex/functional/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ INCLUDES := -I../include -I../../ -I../../../../../usr/include/ 
CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) $(KHDR_INCLUDES)

LDLIBS := -lpthread -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 \
@@ -24,5 +24,3 @@ TEST_PROGS := run.sh 
top_srcdir = ../../../../..

DEFAULT_INSTALL_HDR_PATH := 1

include ../../lib.mk
 


$(TEST_GEN_FILES): $(HEADERS)

tools/testing/selftests/intel_pstate/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
CFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE

LDLIBS += -lm



uname_M := $(shell uname -m 2>/dev/null || echo not)

ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)

ARCH ?= $(shell uname -m 2>/dev/null || echo not)

ARCH_PROCESSED := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/)



ifeq (x86,$(ARCH))

ifeq (x86,$(ARCH_PROCESSED))

TEST_GEN_FILES := msr aperf

endif

tools/testing/selftests/kexec/Makefile

+3 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Makefile for kexec tests



uname_M := $(shell uname -m 2>/dev/null || echo not)

ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)

ARCH ?= $(shell uname -m 2>/dev/null || echo not)

ARCH_PROCESSED := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/)



ifeq ($(ARCH),$(filter $(ARCH),x86 ppc64le))

ifeq ($(ARCH_PROCESSED),$(filter $(ARCH_PROCESSED),x86 ppc64le))

TEST_PROGS := test_kexec_load.sh test_kexec_file_load.sh

TEST_FILES := kexec_common_lib.sh