Commit 8b2791df authored by Phoebe Buckheister's avatar Phoebe Buckheister 🐍

Merge branch 'kernel-4.17-v6' into 'v6'

ci: add kernel 4.17 (v6)

Kernel 4.17 changes the ib_create_cq function to include the caller
name, and adds a macro of the same name as the funtion which adds
the KBUILD_MODNAME. We check that this macro is defined, and use it
if so.

See merge request beegfs/projects0!861
parents 66f92290 e293092b
......@@ -120,6 +120,7 @@ done <<END_OF_KERNEL_GCC_LIST
4.11 6
4.14 6
4.14.13 6
4.17.13 6
END_OF_KERNEL_GCC_LIST
while read ofed kernel ignore_
......
......@@ -462,6 +462,10 @@ client kernel=4,14,13 gcc=6:
image: "bumblebee:5000/kernel/x86_64/gcc6:linux-4.14.13"
variables: {BEEGFS_CI_KERNEL_DIR: "/kernel/linux-4.14.13"}
<<: *client-kernel-generic
client kernel=4,17,13 gcc=6:
image: "bumblebee:5000/kernel/x86_64/gcc6:linux-4.17.13"
variables: {BEEGFS_CI_KERNEL_DIR: "/kernel/linux-4.17.13"}
<<: *client-kernel-generic
client kernel=3,10,0-514,10,2,el7,x86_64 ofed=centos73_mlnx3,4-2,0,0,0:
image: "bumblebee:5000/kernel/x86_64/ofed:centos73_mlnx3.4-2.0.0.0"
variables: {BEEGFS_CI_KERNEL_DIR: "/usr/src/kernels/3.10.0-514.10.2.el7.x86_64"}
......
......@@ -1810,7 +1810,7 @@ struct ib_cq* __IBVSocket_createCompletionQueue(struct ib_device* device,
{
#if defined (BEEGFS_OFED_1_2_API) && BEEGFS_OFED_1_2_API >= 1
return ib_create_cq(device, comp_handler, event_handler, cq_context, cqe);
#elif defined OFED_HAS_IB_CREATE_CQATTR
#elif defined OFED_HAS_IB_CREATE_CQATTR || defined ib_create_cq
struct ib_cq_init_attr attrs = {
.cqe = cqe,
.comp_vector = 0,
......
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