]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
x86: fix build error with post-merge of tip/cpus4096 and rr-for-ingo/master.
authorMike Travis <travis@sgi.com>
Tue, 16 Dec 2008 17:13:11 +0000 (09:13 -0800)
committerIngo Molnar <mingo@elte.hu>
Tue, 16 Dec 2008 22:12:18 +0000 (23:12 +0100)
commitc8cae544bba6aee0f5cb0756dbab1a71d2c68737
treeb7f326377dc0fd76a55e9a23a0c005c2c59913b6
parentc3895b01e80d120e8d19435f7cb1fa4c60c4e269
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: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/io_apic.c