Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c8cae5...
Commit:     c8cae544bba6aee0f5cb0756dbab1a71d2c68737
Parent:     c3895b01e80d120e8d19435f7cb1fa4c60c4e269
Author:     Mike Travis <travis@sgi.com>
AuthorDate: Tue Dec 16 09:13:11 2008 -0800
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue Dec 16 23:12:18 2008 +0100

    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 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index d7f0993..3d7d0d5 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html