aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-10-14 01:02:23 -0400
committerKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-10-14 01:30:54 -0400
commit7da1272547ebe96982a42292dfc833457708f4da (patch)
tree567eca4704e7077924ffdafdb306bc961e9bf553
parent8ed5c00d7c166f505eb2e8ff47748bfa73824130 (diff)
parisc: kill __do_IRQ
Signed-off-by: Kyle McMartin <kyle@redhat.com>
-rw-r--r--arch/parisc/Kconfig4
-rw-r--r--arch/parisc/include/asm/irq.h3
-rw-r--r--arch/parisc/kernel/irq.c4
3 files changed, 4 insertions, 7 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 907417d187e1..2cb6401fc8a2 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -18,6 +18,7 @@ config PARISC
18 select BUG 18 select BUG
19 select HAVE_PERF_EVENTS 19 select HAVE_PERF_EVENTS
20 select GENERIC_ATOMIC64 if !64BIT 20 select GENERIC_ATOMIC64 if !64BIT
21 select GENERIC_HARDIRQS_NO__DO_IRQ
21 help 22 help
22 The PA-RISC microprocessor is designed by Hewlett-Packard and used 23 The PA-RISC microprocessor is designed by Hewlett-Packard and used
23 in many of their workstations & servers (HP9000 700 and 800 series, 24 in many of their workstations & servers (HP9000 700 and 800 series,
@@ -84,6 +85,9 @@ config IRQ_PER_CPU
84 bool 85 bool
85 default y 86 default y
86 87
88config GENERIC_HARDIRQS_NO__DO_IRQ
89 def_bool y
90
87# unless you want to implement ACPI on PA-RISC ... ;-) 91# unless you want to implement ACPI on PA-RISC ... ;-)
88config PM 92config PM
89 bool 93 bool
diff --git a/arch/parisc/include/asm/irq.h b/arch/parisc/include/asm/irq.h
index 3a9b2498fd1c..c67dccf2e31f 100644
--- 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)
32} 32}
33 33
34struct irq_chip; 34struct irq_chip;
35struct irq_desc;
36
37extern void parisc_do_IRQ(unsigned int irq, struct irq_desc *desc);
38 35
39/* 36/*
40 * Some useful "we don't have to do anything here" handlers. Should 37 * 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 e873edaf2747..5024f643b3b1 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -418,7 +418,3 @@ void __init init_IRQ(void)
418 418
419} 419}
420 420
421void parisc_do_IRQ(unsigned int irq, struct irq_desc *desc)
422{
423 __do_IRQ(irq);
424}