Commit 70ec81c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-next-6.10-rc1-fixes' of... 

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

Pull kselftest fixes from Shuah Khan:
 "Revert framework change to add D_GNU_SOURCE to KHDR_INCLUDES to
  Makefile, lib.mk, and kselftest_harness.h and follow-on changes to
  cgroup and sgx test as they are causing build failures and warnings"

* tag 'linux_kselftest-next-6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  Revert "selftests/cgroup: Drop define _GNU_SOURCE"
  Revert "selftests/sgx: Include KHDR_INCLUDES in Makefile"
  Revert "selftests: Compile kselftest headers with -D_GNU_SOURCE"
parents 72ece201 a97853f2

tools/testing/selftests/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -170,11 +170,11 @@ ifneq ($(KBUILD_OUTPUT),) 
  # $(realpath ...) resolves symlinks

  abs_objtree := $(realpath $(abs_objtree))

  BUILD := $(abs_objtree)/kselftest

  KHDR_INCLUDES := -D_GNU_SOURCE -isystem ${abs_objtree}/usr/include

  KHDR_INCLUDES := -isystem ${abs_objtree}/usr/include

else

  BUILD := $(CURDIR)

  abs_srctree := $(shell cd $(top_srcdir) && pwd)

  KHDR_INCLUDES := -D_GNU_SOURCE -isystem ${abs_srctree}/usr/include

  KHDR_INCLUDES := -isystem ${abs_srctree}/usr/include

  DEFAULT_INSTALL_HDR_PATH := 1

endif

tools/testing/selftests/cgroup/cgroup_util.c

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



#define _GNU_SOURCE



#include <errno.h>

#include <fcntl.h>

#include <linux/limits.h>

tools/testing/selftests/cgroup/test_core.c

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



#define _GNU_SOURCE

#include <linux/limits.h>

#include <linux/sched.h>

#include <sys/types.h>

tools/testing/selftests/cgroup/test_cpu.c

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



#define _GNU_SOURCE

#include <linux/limits.h>

#include <sys/sysinfo.h>

#include <sys/wait.h>

tools/testing/selftests/cgroup/test_hugetlb_memcg.c

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

#define _GNU_SOURCE



#include <linux/limits.h>

#include <sys/mman.h>

#include <stdio.h>