Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / frv / kernel / irq.c

diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index e1ab9f2e43fb36e01445261a9885ede7052fc6a9..c7e59dcadee47d58c7c44dac6d1cbce7a2134730 100644 (file)
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -18,7 +18,6 @@
 #include <linux/timex.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
 #include <linux/irq.h>
@@ -97,19 +96,8 @@ int show_interrupts(struct seq_file *p, void *v)
 /*
  * on-CPU PIC operations
  */
-static void frv_cpupic_enable(unsigned int irqlevel)
-{
-       __clr_MASK(irqlevel);
-}
-
-static void frv_cpupic_disable(unsigned int irqlevel)
-{
-       __set_MASK(irqlevel);
-}
-
 static void frv_cpupic_ack(unsigned int irqlevel)
 {
-       __set_MASK(irqlevel);
        __clr_RC(irqlevel);
        __clr_IRL();
 }
@@ -138,8 +126,6 @@ static void frv_cpupic_end(unsigned int irqlevel)
 
 static struct irq_chip frv_cpu_pic = {
        .name           = "cpu",
-       .enable         = frv_cpupic_enable,
-       .disable        = frv_cpupic_disable,
        .ack            = frv_cpupic_ack,
        .mask           = frv_cpupic_mask,
        .mask_ack       = frv_cpupic_mask_ack,
@@ -156,7 +142,7 @@ static struct irq_chip frv_cpu_pic = {
 asmlinkage void do_IRQ(void)
 {
        irq_enter();
-       __do_IRQ(__get_IRL(), __frame);
+       generic_handle_irq(__get_IRL());
        irq_exit();
 }