This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c
index c1df603..f3c0d2c 100644 (file)
--- a/arch/ppc/kernel/irq.c
+++ b/arch/ppc/kernel/irq.c
@@ -304,8 +304,10 @@ void disable_irq_nosync(unsigned int irq)
 
 void disable_irq(unsigned int irq)
 {
+       irq_desc_t *desc = irq_desc + irq;
        disable_irq_nosync(irq);
-       synchronize_irq(irq);
+       if (desc->action)
+               synchronize_irq(irq);
 }
 
 /**
@@ -626,7 +628,9 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
 static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer,
                                        unsigned long count, void *data)
 {
-       cpumask_t *mask = (cpumask_t *)data, full_count = count, err;
+       int err;
+       int full_count = count;
+       cpumask_t *mask = (cpumask_t *)data;
        cpumask_t new_value;
 
        err = cpumask_parse(buffer, count, new_value);