summaryrefslogtreecommitdiff
path: root/net/sctp/stream_sched.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-03 12:03:56 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-03 12:03:56 +0200
commit85829ea26ba91f8e98d5defc0ac8d20967b8eb43 (patch)
treee53285c30765ada2461ef1c7112466a0d3716cf8 /net/sctp/stream_sched.c
parent9f47669d5325565e2d078fb6a0b0d9070834572c (diff)
parentd676d6149a2f4b4d66b8ea0a1dfef30a54cf5750 (diff)
Merge v5.15.59linaro-local/ci/tcwg_kernel/llvm-release-arm-lts-defconfiglinaro-local/ci/tcwg_kernel/llvm-release-arm-lts-allyesconfiglinaro-local/ci/tcwg_kernel/llvm-release-arm-lts-allnoconfiglinaro-local/ci/tcwg_kernel/llvm-release-arm-lts-allmodconfiglinaro-local/ci/tcwg_kernel/llvm-release-aarch64-lts-defconfiglinaro-local/ci/tcwg_kernel/llvm-release-aarch64-lts-allyesconfiglinaro-local/ci/tcwg_kernel/llvm-release-aarch64-lts-allnoconfiglinaro-local/ci/tcwg_kernel/llvm-release-aarch64-lts-allmodconfiglinaro-local/ci/tcwg_kernel/llvm-master-arm-lts-defconfiglinaro-local/ci/tcwg_kernel/llvm-master-arm-lts-allyesconfiglinaro-local/ci/tcwg_kernel/llvm-master-arm-lts-allnoconfiglinaro-local/ci/tcwg_kernel/llvm-master-arm-lts-allmodconfiglinaro-local/ci/tcwg_kernel/llvm-master-aarch64-lts-defconfiglinaro-local/ci/tcwg_kernel/llvm-master-aarch64-lts-allyesconfiglinaro-local/ci/tcwg_kernel/llvm-master-aarch64-lts-allnoconfiglinaro-local/ci/tcwg_kernel/llvm-master-aarch64-lts-allmodconfiglinaro-local/ci/tcwg_kernel/gnu-release-arm-lts-defconfiglinaro-local/ci/tcwg_kernel/gnu-release-arm-lts-allyesconfiglinaro-local/ci/tcwg_kernel/gnu-release-arm-lts-allnoconfiglinaro-local/ci/tcwg_kernel/gnu-release-arm-lts-allmodconfiglinaro-local/ci/tcwg_kernel/gnu-release-aarch64-lts-defconfiglinaro-local/ci/tcwg_kernel/gnu-release-aarch64-lts-allyesconfiglinaro-local/ci/tcwg_kernel/gnu-release-aarch64-lts-allnoconfiglinaro-local/ci/tcwg_kernel/gnu-release-aarch64-lts-allmodconfiglinaro-local/ci/tcwg_kernel/gnu-master-arm-lts-defconfiglinaro-local/ci/tcwg_kernel/gnu-master-arm-lts-allyesconfiglinaro-local/ci/tcwg_kernel/gnu-master-arm-lts-allnoconfiglinaro-local/ci/tcwg_kernel/gnu-master-arm-lts-allmodconfiglinaro-local/ci/tcwg_kernel/gnu-master-aarch64-lts-defconfiglinaro-local/ci/tcwg_kernel/gnu-master-aarch64-lts-allyesconfiglinaro-local/ci/tcwg_kernel/gnu-master-aarch64-lts-allnoconfiglinaro-local/ci/tcwg_kernel/gnu-master-aarch64-lts-allmodconfig
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sctp/stream_sched.c')
-rw-r--r--net/sctp/stream_sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/stream_sched.c b/net/sctp/stream_sched.c
index 99e5f69fbb74..a2e1d34f52c5 100644
--- a/net/sctp/stream_sched.c
+++ b/net/sctp/stream_sched.c
@@ -163,7 +163,7 @@ int sctp_sched_set_sched(struct sctp_association *asoc,
if (!SCTP_SO(&asoc->stream, i)->ext)
continue;
- ret = n->init_sid(&asoc->stream, i, GFP_KERNEL);
+ ret = n->init_sid(&asoc->stream, i, GFP_ATOMIC);
if (ret)
goto err;
}