Skip to contentSkip to conversation

genirq/affinity: Fix build waring in __irq_build_affinity_masks

PATCH Applied Ming Lei 2 participants 2 messages Aug 28, 2019 IRQ

lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH 1/1 genirq/affinity: Fix build waring in __irq_build_affinity_masks

When CONFIG_CPUMASK_OFFSTACK isn't enabled, 'cpumask_var_t' will be defined as 'typedef struct cpumask cpumask_var_t[1]', so we can't declare the argument of 'node_to_cpumask' as 'const cpumask_var_t *' for alloc_nodes_vectors().

Fixes the following warning:

kernel/irq/affinity.c: In function '__irq_build_affinity_masks':

Quoted 1 line
Quoted 1 line

kernel/irq/affinity.c:287:31: warning: passing argument 2 of 'alloc_nodes_vectors' from incompatible pointer type

alloc_nodes_vectors(numvecs, node_to_cpumask, cpu_mask,
^
kernel/irq/affinity.c:128:13: note: expected 'const struct cpumask (*)[1]' but argument is of type 'struct cpumask (*)[1]'
static void alloc_nodes_vectors(unsigned int numvecs,
^

Fixes b1a5a73e64e9 ("genirq/affinity: Spread vectors on node according to nr_cpu ratio")
Cc Keith Busch <[email protected]>
Cc Jon Derrick <[email protected]>
---
 kernel/irq/affinity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/irq/affinity.c +1 -1
index d905e844bf3a..4d89ad4fae3b 100644
@@ -126,7 +126,7 @@ static int ncpus_cmp_func(const void *l, const void *r)
  * for each node.
  */
 static void alloc_nodes_vectors(unsigned int numvecs,
-				const cpumask_var_t *node_to_cpumask,
+				cpumask_var_t *node_to_cpumask,
 				const struct cpumask *cpu_mask,
 				const nodemask_t nodemsk,
 				struct cpumask *nmsk,
Signature · 1 line
2.20.1
merge bot Applied
#1 lore raw

[tip: irq/core] genirq/affinity: Remove const qualifier from node_to_cpumask argument

The following commit has been merged into the irq/core branch of tip:

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     101f85b56d03b36418bbf867f67d81710839b0ec
Gitweb:        https://git.kernel.org/tip/101f85b56d03b36418bbf867f67d81710839b0ec
Author:        Ming Lei <[email protected]>
AuthorDate:    Wed, 28 Aug 2019 16:58:15 +08:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Wed, 28 Aug 2019 12:20:43 +02:00

genirq/affinity: Remove const qualifier from node_to_cpumask argument

When CONFIG_CPUMASK_OFFSTACK isn't enabled, 'cpumask_var_t' is as

'typedef struct cpumask cpumask_var_t[1]',

so the argument 'node_to_cpumask' alloc_nodes_vectors() can't be declared as 'const cpumask_var_t *'

Fixes the following warning:

kernel/irq/affinity.c: In function '__irq_build_affinity_masks':
alloc_nodes_vectors(numvecs, node_to_cpumask, cpu_mask,
^
kernel/irq/affinity.c:128:13: note: expected 'const struct cpumask (*)[1]' but argument is of type 'struct cpumask (*)[1]'
static void alloc_nodes_vectors(unsigned int numvecs,
^

Fixes b1a5a73e64e9 ("genirq/affinity: Spread vectors on node according to nr_cpu ratio")
---
 kernel/irq/affinity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/irq/affinity.c +1 -1
index d905e84..4d89ad4 100644
@@ -126,7 +126,7 @@ static int ncpus_cmp_func(const void *l, const void *r)
  * for each node.
  */
 static void alloc_nodes_vectors(unsigned int numvecs,
-				const cpumask_var_t *node_to_cpumask,
+				cpumask_var_t *node_to_cpumask,
 				const struct cpumask *cpu_mask,
 				const nodemask_t nodemsk,
 				struct cpumask *nmsk,