Commit f1583cb1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-next-5.15-rc1' of... 

Merge tag 'linux-kselftest-next-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest updates from Shuah Khan:
 "Fixes to build and test failures:

   - openat2 test failure for O_LARGEFILE flag on ARM64

   - x86 test build failures related to glibc 2.34 adding support for
     variable sized MINSIGSTKSZ and SIGSTKSZ

   - removing obsolete configs in sync and cpufreq config files

   - minor spelling and duplicate header include cleanups"

* tag 'linux-kselftest-next-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/cpufreq: Rename DEBUG_PI_LIST to DEBUG_PLIST
  selftests/sync: Remove the deprecated config SYNC
  selftests: safesetid: Fix spelling mistake "cant" -> "can't"
  selftests/x86: Fix error: variably modified 'altstack_data' at file scope
  kselftest:sched: remove duplicate include in cs_prctl_test.c
  selftests: openat2: Fix testing failure for O_LARGEFILE flag
parents b250e6d1 67d6d80d

tools/testing/selftests/cpufreq/config

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y 
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_PI_LIST=y

CONFIG_DEBUG_PLIST=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_LOCK_ALLOC=y

tools/testing/selftests/openat2/openat2_test.c

+4 −0
Original line number Diff line number Diff line
@@ -22,7 +22,11 @@ 
 * XXX: This is wrong on {mips, parisc, powerpc, sparc}.

 */

#undef	O_LARGEFILE

#ifdef __aarch64__

#define	O_LARGEFILE 0x20000

#else

#define	O_LARGEFILE 0x8000

#endif



struct open_how_ext {

	struct open_how inner;

tools/testing/selftests/safesetid/safesetid-test.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void write_policies(void) 


	fd = open(add_whitelist_policy_file, O_WRONLY);

	if (fd < 0)

		die("cant open add_whitelist_policy file\n");

		die("can't open add_whitelist_policy file\n");

	written = write(fd, policy_str, strlen(policy_str));

	if (written != strlen(policy_str)) {

		if (written >= 0) {

tools/testing/selftests/sched/cs_prctl_test.c

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <sys/types.h>

#include <sched.h>

#include <sys/prctl.h>

#include <sys/types.h>

#include <sys/wait.h>

#include <unistd.h>

#include <time.h>

#include <stdio.h>

tools/testing/selftests/sync/config

+0 −1
Original line number Diff line number Diff line 
CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y