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

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
...@@ -40,6 +40,7 @@ ifeq (0,$(MAKELEVEL)) ...@@ -40,6 +40,7 @@ ifeq (0,$(MAKELEVEL))
endif endif
endif endif
selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST)))) selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST))))
top_srcdir = $(selfdir)/../../..
# The following are built by lib.mk common compile rules. # The following are built by lib.mk common compile rules.
# TEST_CUSTOM_PROGS should be used by tests that require # TEST_CUSTOM_PROGS should be used by tests that require
......
...@@ -17,6 +17,12 @@ ...@@ -17,6 +17,12 @@
#include "defines.h" #include "defines.h"
#include "main.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 { struct q1q2_ctx {
BN_CTX *bn_ctx; BN_CTX *bn_ctx;
BIGNUM *m; BIGNUM *m;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment