---

yaml --- r: 218926 b: refs/heads/master c: 7da1272 h: refs/heads/master v: v3
git-mirror · Oct 14, 2010 · e8864b3 · e8864b3
1 parent 43ca166
commit e8864b3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ed5c00d7c166f505eb2e8ff47748bfa73824130
+refs/heads/master: 7da1272547ebe96982a42292dfc833457708f4da
diff --git a/trunk/arch/parisc/Kconfig b/trunk/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/trunk/arch/parisc/include/asm/irq.h b/trunk/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/trunk/arch/parisc/kernel/irq.c b/trunk/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);
-}
-Original file line number
+Diff line change
@@ Expand Up / @@ -418,7 +418,3 @@ void __init init_IRQ(void) @@
     }
-    void parisc_do_IRQ(unsigned int irq, struct irq_desc *desc)
-    {
-    	__do_IRQ(irq);
-    }