Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / arch / ppc / kernel / irq.c

diff --git a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c
index 6da0929..2ac2e4b 100644 (file)
--- a/arch/ppc/kernel/irq.c
+++ b/arch/ppc/kernel/irq.c
@@ -106,7 +106,7 @@ void *irq_kmalloc(size_t size, int pri)
                        cache_bitmask |= (1<<i);
                        return (void *)(&malloc_cache[i]);
                }
-       return 0;
+       return NULL;
 }
 
 void irq_kfree(void *ptr)
@@ -171,7 +171,12 @@ setup_irq(unsigned int irq, struct irqaction * new)
        if (!shared) {
                desc->depth = 0;
                desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING);
-               unmask_irq(irq);
+               if (desc->handler) {
+                       if (desc->handler->startup)
+                               desc->handler->startup(irq);
+                       else if (desc->handler->enable)
+                               desc->handler->enable(irq);
+               }
        }
        spin_unlock_irqrestore(&desc->lock,flags);
 
@@ -676,7 +681,7 @@ void init_irq_proc (void)
        int i;
 
        /* create /proc/irq */
-       root_irq_dir = proc_mkdir("irq", 0);
+       root_irq_dir = proc_mkdir("irq", NULL);
 
        /* create /proc/irq/prof_cpu_mask */
        entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);