Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 6bdf197b04b3ae7c85785bc5a9576f1bcb0ac7c0

Authored by Ingo Molnar
1 parent 263ec6457b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

ia64: cpumask fix for is_affinity_mask_valid() 

Impact: build fix on ia64

ia64's default_affinity_write() still had old cpumask_t usage:

 /home/mingo/tip/kernel/irq/proc.c: In function `default_affinity_write':
 /home/mingo/tip/kernel/irq/proc.c:114: error: incompatible type for argument 1 of `is_affinity_mask_valid'
 make[3]: *** [kernel/irq/proc.o] Error 1
 make[3]: *** Waiting for unfinished jobs....

update it to cpumask_var_t.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 3 changed files with 4 additions and 4 deletions Side-by-side Diff

arch/ia64/include/asm/irq.h
Diff comments   View file @ 6bdf197
... ... @@ -27,7 +27,7 @@
27 27 }
28 28  
29 29 extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);
30   -bool is_affinity_mask_valid(cpumask_t cpumask);
  30 +bool is_affinity_mask_valid(cpumask_var_t cpumask);
31 31  
32 32 #define is_affinity_mask_valid is_affinity_mask_valid
33 33  
arch/ia64/kernel/irq.c
Diff comments   View file @ 6bdf197
... ... @@ -112,11 +112,11 @@
112 112 }
113 113 }
114 114  
115   -bool is_affinity_mask_valid(cpumask_t cpumask)
  115 +bool is_affinity_mask_valid(cpumask_var_t cpumask)
116 116 {
117 117 if (ia64_platform_is("sn2")) {
118 118 /* Only allow one CPU to be specified in the smp_affinity mask */
119   - if (cpus_weight(cpumask) != 1)
  119 + if (cpumask_weight(cpumask) != 1)
120 120 return false;
121 121 }
122 122 return true;
... ... @@ -54,7 +54,7 @@
54 54 if (err)
55 55 goto free_cpumask;
56 56  
57   - if (!is_affinity_mask_valid(*new_value)) {
  57 + if (!is_affinity_mask_valid(new_value)) {
58 58 err = -EINVAL;
59 59 goto free_cpumask;
60 60 }