Commit 3ee3d984 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull Kselftest fixes from Shuah Khan:
 "Fixes to vm and sgx test builds"

* tag 'linux-kselftest-fixes-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/vm: fix inability to build any vm tests
  selftests/sgx: Ignore OpenSSL 3.0 deprecated functions warning
parents 072e5135 bdbf0617

tools/testing/selftests/lib.mk

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ ifeq (0,$(MAKELEVEL)) 
    endif

endif

selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST))))

top_srcdir = $(selfdir)/../../..



# The following are built by lib.mk common compile rules.

# TEST_CUSTOM_PROGS should be used by tests that require

tools/testing/selftests/sgx/sigstruct.c

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 
#include "defines.h"

#include "main.h"



/*

 * FIXME: OpenSSL 3.0 has deprecated some functions. For now just ignore

 * the warnings.

 */

#pragma GCC diagnostic ignored "-Wdeprecated-declarations"



struct q1q2_ctx {

	BN_CTX *bn_ctx;

	BIGNUM *m;