parisc: kill __do_IRQ

Signed-off-by: Kyle McMartin <kyle@redhat.com>

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 907417d187e15039bb4bb6d96075cd950a045dbd..2cb6401fc8a2a0683c9e85b2150f013daa115ac6 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -18,6 +18,7 @@ config PARISC
        select BUG
        select HAVE_PERF_EVENTS
        select GENERIC_ATOMIC64 if !64BIT
+       select GENERIC_HARDIRQS_NO__DO_IRQ
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
          in many of their workstations & servers (HP9000 700 and 800 series,
@@ -84,6 +85,9 @@ config IRQ_PER_CPU
        bool
        default y
 
+config GENERIC_HARDIRQS_NO__DO_IRQ
+       def_bool y
+
 # unless you want to implement ACPI on PA-RISC ... ;-)
 config PM
        bool

diff --git a/arch/parisc/include/asm/irq.h b/arch/parisc/include/asm/irq.h
index 3a9b2498fd1ccd6d7deca745e390b8053dfeca60..c67dccf2e31f801860a7392598e951560921f3ce 100644 (file)
--- a/arch/parisc/include/asm/irq.h
+++ b/arch/parisc/include/asm/irq.h
@@ -32,9 +32,6 @@ static __inline__ int irq_canonicalize(int irq)
 }
 
 struct irq_chip;
-struct irq_desc;
-
-extern void parisc_do_IRQ(unsigned int irq, struct irq_desc *desc);
 
 /*
  * Some useful "we don't have to do anything here" handlers.  Should

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index e873edaf274749a79a5b94f020baf10ce14ec76c..5024f643b3b1a4c75a57a08756298c5b72e874a2 100644 (file)
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -418,7 +418,3 @@ void __init init_IRQ(void)
 
 }
 
-void parisc_do_IRQ(unsigned int irq, struct irq_desc *desc)
-{
-       __do_IRQ(irq);
-}