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

Commit c8cae544 authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

x86: fix build error with post-merge of tip/cpus4096 and rr-for-ingo/master. 



Ingo Molnar wrote:

> allyes64 build failure:
>
> arch/x86/kernel/io_apic.c: In function ‘set_ir_ioapic_affinity_irq_desc’:
> arch/x86/kernel/io_apic.c:2295: error: incompatible type for argument 2 of
> ‘migrate_ioapic_irq_desc’
> arch/x86/kernel/io_apic.c: In function ‘ir_set_msi_irq_affinity’:
> arch/x86/kernel/io_apic.c:3205: error: incompatible type for argument 2 of
> ‘set_extra_move_desc’
> make[1]: *** wait: No child processes.  Stop.

Here's a small patch to correct the build error with the post-merge tree.
Built and boot-tested.  I'll will reset the follow on patches in my brand
new git tree to accommodate this change.

Fix two references in io_apic.c that were incorrect.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c3895b01

arch/x86/kernel/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -2292,7 +2292,7 @@ static void set_ir_ioapic_affinity_irq_desc(struct irq_desc *desc, 
		return;

	}



	migrate_ioapic_irq_desc(desc, mask);

	migrate_ioapic_irq_desc(desc, *mask);

}

static void set_ir_ioapic_affinity_irq(unsigned int irq,

				       const struct cpumask *mask)
@@ -3203,7 +3203,7 @@ static void ir_set_msi_irq_affinity(unsigned int irq, 
	if (assign_irq_vector(irq, cfg, *mask))

		return;



	set_extra_move_desc(desc, mask);

	set_extra_move_desc(desc, *mask);



	cpumask_and(&tmp, &cfg->domain, mask);

	dest = cpu_mask_to_apicid(tmp);