kernel-5.4: bump to 5.4.102 and refresh patches
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0115-sdk_qbman-Update-cpus_allowed-to-cpus_mask-to-cope-w.patch
1 From 0bd330ec1fd657b5d04f0ab668b9fbaf7473fe8c Mon Sep 17 00:00:00 2001
2 From: Li Yang <leoyang.li@nxp.com>
3 Date: Tue, 11 Jun 2019 18:51:31 -0500
4 Subject: [PATCH] sdk_qbman: Update cpus_allowed to cpus_mask to cope with
5 upstream change
6
7 Signed-off-by: Li Yang <leoyang.li@nxp.com>
8 ---
9 drivers/staging/fsl_qbman/fsl_usdpaa_irq.c | 4 ++--
10 drivers/staging/fsl_qbman/qman_driver.c | 2 +-
11 2 files changed, 3 insertions(+), 3 deletions(-)
12
13 --- a/drivers/staging/fsl_qbman/fsl_usdpaa_irq.c
14 +++ b/drivers/staging/fsl_qbman/fsl_usdpaa_irq.c
15 @@ -145,11 +145,11 @@ static int map_irq(struct file *fp, stru
16 fput(ctx->usdpaa_filp);
17 return ret;
18 }
19 - ret = irq_set_affinity(ctx->irq_num, &current->cpus_allowed);
20 + ret = irq_set_affinity(ctx->irq_num, &current->cpus_mask);
21 if (ret)
22 pr_err("USDPAA irq_set_affinity() failed, ret= %d\n", ret);
23
24 - ret = irq_set_affinity_hint(ctx->irq_num, &current->cpus_allowed);
25 + ret = irq_set_affinity_hint(ctx->irq_num, &current->cpus_mask);
26 if (ret)
27 pr_err("USDPAA irq_set_affinity_hint() failed, ret= %d\n", ret);
28
29 --- a/drivers/staging/fsl_qbman/qman_driver.c
30 +++ b/drivers/staging/fsl_qbman/qman_driver.c
31 @@ -646,7 +646,7 @@ static struct qman_portal *init_pcfg(str
32 static void init_slave(int cpu)
33 {
34 struct qman_portal *p;
35 - struct cpumask oldmask = current->cpus_allowed;
36 + struct cpumask oldmask = current->cpus_mask;
37 set_cpus_allowed_ptr(current, get_cpu_mask(cpu));
38 p = qman_create_affine_slave(shared_portals[shared_portals_idx++], cpu);
39 if (!p)