From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 18 Mar 2009 12:19:49 +0000 (+0100)
Subject: Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86... 
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=705bb9dc72b2464a7e421ee45d5e4a3f206d5c75;p=linux-2.6-omap-h63xx.git

Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core

Conflicts:
	arch/parisc/kernel/irq.c
---

705bb9dc72b2464a7e421ee45d5e4a3f206d5c75
diff --cc arch/parisc/kernel/irq.c
index 49482806863,49482806863,49482806863,49482806863,49482806863,49482806863,49482806863,49482806863,ac2c822928c,49482806863,49482806863,29e70e16ede..2b5f5915dd1
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@@@@@@@@@@@@ -120,7 -120,7 -120,7 -120,7 -120,7 -120,7 -120,7 -120,7 -120,7 -120,7 -120,7 -120,7 +120,7 @@@@@@@@@@@@@ int cpu_check_affinity(unsigned int irq
            	if (CHECK_IRQ_PER_CPU(irq)) {
            		/* Bad linux design decision.  The mask has already
            		 * been set; we must reset it */
-------- -- 		cpumask_setall(irq_desc[irq].affinity);
        -   		irq_desc[irq].affinity = CPU_MASK_ALL;
+++++++++++ 		cpumask_setall(&irq_desc[irq].affinity);
            		return -EINVAL;
            	}
            
@@@@@@@@@@@@@ -133,10 -133,10 -133,10 -133,10 -133,10 -133,10 -133,10 -133,10 -133,10 -133,10 -133,10 -132,13 +132,13 @@@@@@@@@@@@@
            
            static void cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest)
            {
----------- 	if (cpu_check_affinity(irq, dest))
+++++++++++ 	int cpu_dest;
+++++++++++ 
+++++++++++ 	cpu_dest = cpu_check_affinity(irq, dest);
+++++++++++ 	if (cpu_dest < 0)
            		return;
            
-------- -- 	cpumask_copy(irq_desc[irq].affinity, dest);
        -   	irq_desc[irq].affinity = *dest;
           -	cpumask_copy(&irq_desc[irq].affinity, &cpumask_of_cpu(cpu_dest));
++++++++++++	cpumask_copy(&irq_desc[irq].affinity, dest);
            }
            #endif
            
@@@@@@@@@@@@@ -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 -297,7 +297,7 @@@@@@@@@@@@@ int txn_alloc_irq(unsigned int bits_wid
            unsigned long txn_affinity_addr(unsigned int irq, int cpu)
            {
            #ifdef CONFIG_SMP
-------- -- 	cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu));
        -   	irq_desc[irq].affinity = cpumask_of_cpu(cpu);
+++++++++++ 	cpumask_copy(&irq_desc[irq].affinity, cpumask_of(cpu));
            #endif
            
            	return per_cpu(cpu_data, cpu).txn_addr;
@@@@@@@@@@@@@ -352,7 -352,7 -352,7 -352,7 -352,7 -352,7 -352,7 -352,7 -352,7 -352,7 -352,7 -354,7 +354,7 @@@@@@@@@@@@@ void do_cpu_irq_mask(struct pt_regs *re
            	irq = eirr_to_irq(eirr_val);
            
            #ifdef CONFIG_SMP
-------- -- 	cpumask_copy(&dest, irq_desc[irq].affinity);
        -   	dest = irq_desc[irq].affinity;
+++++++++++ 	cpumask_copy(&dest, &irq_desc[irq].affinity);
            	if (CHECK_IRQ_PER_CPU(irq_desc[irq].status) &&
            	    !cpu_isset(smp_processor_id(), dest)) {
            		int cpu = first_cpu(dest);