lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ia64: cpumask fix for is_affinity_mask_valid()

Browse Source 
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>
This commit is contained in:
Ingo Molnar
2009-01-03 12:50:46 +01:00
parent 263ec6457b
commit 6bdf197b04
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/irq.h
View File

@@ -27,7 +27,7 @@ irq_canonicalize (int irq)
} }
extern void set_irq_affinity_info (unsigned int irq, int dest, int redir); extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);
bool is_affinity_mask_valid(cpumask_t cpumask); bool is_affinity_mask_valid(cpumask_var_t cpumask);
#define is_affinity_mask_valid is_affinity_mask_valid #define is_affinity_mask_valid is_affinity_mask_valid

4
arch/ia64/kernel/irq.c
View File

@@ -112,11 +112,11 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
} }
} }
bool is_affinity_mask_valid(cpumask_t cpumask) bool is_affinity_mask_valid(cpumask_var_t cpumask)
{ {
if (ia64_platform_is("sn2")) { if (ia64_platform_is("sn2")) {
/* Only allow one CPU to be specified in the smp_affinity mask */ /* Only allow one CPU to be specified in the smp_affinity mask */
if (cpus_weight(cpumask) != 1) if (cpumask_weight(cpumask) != 1)
return false; return false;
} }
return true; return true;

2
kernel/irq/proc.c
View File

@@ -54,7 +54,7 @@ static ssize_t irq_affinity_proc_write(struct file *file,
if (err) if (err)
goto free_cpumask; goto free_cpumask;
if (!is_affinity_mask_valid(*new_value)) { if (!is_affinity_mask_valid(new_value)) {
err = -EINVAL; err = -EINVAL;
goto free_cpumask; goto free_cpumask;
} }