]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86...
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 12:19:49 +0000 (13:19 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 12:19:49 +0000 (13:19 +0100)
Conflicts:
arch/parisc/kernel/irq.c

1  2  3  4  5  6  7  8  9  10  11  12 
arch/parisc/kernel/irq.c
arch/x86/include/asm/paravirt.h
arch/x86/kernel/tsc.c
drivers/acpi/osl.c

index 49482806863fa522d71e6e37d90a5c470e1e4023,49482806863fa522d71e6e37d90a5c470e1e4023,49482806863fa522d71e6e37d90a5c470e1e4023,49482806863fa522d71e6e37d90a5c470e1e4023,49482806863fa522d71e6e37d90a5c470e1e4023,49482806863fa522d71e6e37d90a5c470e1e4023,49482806863fa522d71e6e37d90a5c470e1e4023,49482806863fa522d71e6e37d90a5c470e1e4023,ac2c822928c75e3ade5d9e6d278c08804703c3d8,49482806863fa522d71e6e37d90a5c470e1e4023,49482806863fa522d71e6e37d90a5c470e1e4023,29e70e16ede8feaa9672f270c13bdf04aadd174a..2b5f5915dd1d723fef8f777a3429f6f6f35c85c4
@@@@@@@@@@@@@ -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;
                }
            
            
            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);
Simple merge
Simple merge
Simple merge