summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2023-04-21 13:29:51 +0200
committeriwlwifi publisher <>2023-04-21 20:07:54 +0000
commita55b58246b4aa9e1897ac6c8e1560d0e9c592a78 (patch)
tree8e92f1f6fa7827499b341438672a7c5c9e985bab
parent5a02cf63a4c6da087587ae786d3fad09e7d919d0 (diff)
downloadbackport-iwlwifi-a55b58246b4aa9e1897ac6c8e1560d0e9c592a78.tar.gz
[BUGFIX] compat: build kunit code only if possible
If the base kernel doesn't have kunit, we need to not build the kunit helper code. type=bugfix ticket=jira:WIFI-302614 fixes=Ie0f7a582dffb05b2f9ddff4ab7f8d4058d9a0606 Change-Id: I9c6d7bf2854a5f8e31097098790ffa99ac798a57 Signed-off-by: Johannes Berg <johannes.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/52193 tested: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Berg, Benjamin <benjamin.berg@intel.com> Tested-by: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> x-iwlwifi-stack-dev: ca288328c5d357669bf0ace78752574173c04bb7
-rw-r--r--compat/backport-6.4.c2
-rw-r--r--versions2
2 files changed, 2 insertions, 2 deletions
diff --git a/compat/backport-6.4.c b/compat/backport-6.4.c
index 0fd965bdd3..995c1f1d1b 100644
--- a/compat/backport-6.4.c
+++ b/compat/backport-6.4.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
-#if LINUX_VERSION_IS_GEQ(6,2,0)
+#if LINUX_VERSION_IS_GEQ(6,2,0) && defined(CONFIG_KUNIT)
#include <kunit/test.h>
struct kunit_auto_cleanup {
diff --git a/versions b/versions
index 8a5557a5af..c6bfefa32f 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11169:755d0abb"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11170:ca288328"