drm: update drm pci ids list

[safe/jmp/linux-2.6] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 31007d6..ad3295c 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -84,9 +84,9 @@ asmlinkage void __do_softirq(void)
        cpu = smp_processor_id();
 restart:
        /* Reset the pending bitmask before enabling irqs */
-       local_softirq_pending() = 0;
+       set_softirq_pending(0);
 
-       //local_irq_enable();
+       local_irq_enable();
 
        h = softirq_vec;
 
@@ -99,7 +99,7 @@ restart:
                pending >>= 1;
        } while (pending);
 
-       //local_irq_disable();
+       local_irq_disable();
 
        pending = local_softirq_pending();
        if (pending && --max_restart)
@@ -470,7 +470,8 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
 #ifdef CONFIG_HOTPLUG_CPU
        case CPU_UP_CANCELED:
                /* Unbind so it can run.  Fall thru. */
-               kthread_bind(per_cpu(ksoftirqd, hotcpu), smp_processor_id());
+               kthread_bind(per_cpu(ksoftirqd, hotcpu),
+                            any_online_cpu(cpu_online_map));
        case CPU_DEAD:
                p = per_cpu(ksoftirqd, hotcpu);
                per_cpu(ksoftirqd, hotcpu) = NULL;