Commit 32f88d65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-fixes-6.10-rc3' of... 

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

Pull kselftest fixes from Shuah Khan:
 "Fixes to build warnings in several tests and fixes to ftrace tests"

* tag 'linux_kselftest-fixes-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/futex: don't pass a const char* to asprintf(3)
  selftests/futex: don't redefine .PHONY targets (all, clean)
  selftests/tracing: Fix event filter test to retry up to 10 times
  selftests/futex: pass _GNU_SOURCE without a value to the compiler
  selftests/overlayfs: Fix build error on ppc64
  selftests/openat2: Fix build warnings on ppc64
  selftests: cachestat: Fix build warnings on ppc64
  tracing/selftests: Fix kprobe event name test for .isra. functions
  selftests/ftrace: Update required config
  selftests/ftrace: Fix to check required event file
  kselftest/alsa: Ensure _GNU_SOURCE is defined
parents 2ab79514 4bf15b1c

tools/testing/selftests/alsa/Makefile

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

#



CFLAGS += $(shell pkg-config --cflags alsa)

CFLAGS += $(shell pkg-config --cflags alsa) $(KHDR_INCLUDES)

LDLIBS += $(shell pkg-config --libs alsa)

ifeq ($(LDLIBS),)

LDLIBS += -lasound

tools/testing/selftests/cachestat/test_cachestat.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define _GNU_SOURCE

#define __SANE_USERSPACE_TYPES__ // Use ll64



#include <stdio.h>

#include <stdbool.h>

tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define _GNU_SOURCE

#define __SANE_USERSPACE_TYPES__ // Use ll64



#include <inttypes.h>

#include <unistd.h>

tools/testing/selftests/ftrace/config

+19 −7
Original line number Diff line number Diff line 
CONFIG_KPROBES=y

CONFIG_BPF_SYSCALL=y

CONFIG_DEBUG_INFO_BTF=y

CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_EPROBE_EVENTS=y

CONFIG_FPROBE=y

CONFIG_FPROBE_EVENTS=y

CONFIG_FTRACE=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_FUNCTION_GRAPH_RETVAL=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_TRACER_SNAPSHOT=y

CONFIG_STACK_TRACER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_SCHED_TRACER=y

CONFIG_PREEMPT_TRACER=y

CONFIG_IRQSOFF_TRACER=y

CONFIG_PREEMPTIRQ_DELAY_TEST=m

CONFIG_KALLSYMS_ALL=y

CONFIG_KPROBES=y

CONFIG_KPROBE_EVENTS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PREEMPTIRQ_DELAY_TEST=m

CONFIG_PREEMPT_TRACER=y

CONFIG_PROBE_EVENTS_BTF_ARGS=y

CONFIG_SAMPLES=y

CONFIG_SAMPLE_FTRACE_DIRECT=m

CONFIG_SAMPLE_TRACE_PRINTK=m

CONFIG_KALLSYMS_ALL=y
 
CONFIG_SCHED_TRACER=y

CONFIG_STACK_TRACER=y

CONFIG_TRACER_SNAPSHOT=y

CONFIG_UPROBES=y

CONFIG_UPROBE_EVENTS=y

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 events/syscalls/sys_enter_openat



echo 0 > events/enable