Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bdf197b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent 263ec645

arch/ia64/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ irq_canonicalize (int irq) 
}



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

arch/ia64/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -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")) {

		/* 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 true;

kernel/irq/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static ssize_t irq_affinity_proc_write(struct file *file, 
	if (err)

		goto free_cpumask;



	if (!is_affinity_mask_valid(*new_value)) {

	if (!is_affinity_mask_valid(new_value)) {

		err = -EINVAL;

		goto free_cpumask;

	}