Skip to contentSkip to conversation

cris: convert to asm-generic/hardirq.h

PATCH In review Christoph Hellwig 2 participants 2 messages Aug 4, 2009 – Sep 1, 2009

lore
Share & tools
lore

Christoph Hellwig

author
#0 lore raw

PATCH 1/1 cris: convert to asm-generic/hardirq.h

Signed-off-by Christoph Hellwig <[email protected]>
arch/cris/include/asm/hardirq.h +2 -10
Index: linux-2.6/arch/cris/include/asm/hardirq.h
===================================================================
@@ -2,16 +2,6 @@
 #define __ASM_HARDIRQ_H
 
 #include <asm/irq.h>
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
-void ack_bad_irq(unsigned int irq);
 
 #define HARDIRQ_BITS	8
 

@@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq);
 # error HARDIRQ_BITS is too low!
 #endif
 
+#include <asm-generic/hardirq.h>
+
 #endif /* __ASM_HARDIRQ_H */
arch/cris/kernel/irq.c +0 -5
Index: linux-2.6/arch/cris/kernel/irq.c
===================================================================
@@ -38,11 +38,6 @@
 
 #include <asm/io.h>
 
-void ack_bad_irq(unsigned int irq)
-{
-	printk("unexpected IRQ trap at vector %02x\n", irq);
-}
-
 int show_interrupts(struct seq_file *p, void *v)
 {
 	int i = *(loff_t *) v, j;
#1 lore raw
Quoted 36 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>

Index: linux-2.6/arch/cris/include/asm/hardirq.h
===================================================================

arch/cris/include/asm/hardirq.h +2 -10
@@ -2,16 +2,6 @@
 #define __ASM_HARDIRQ_H
 
 #include <asm/irq.h>
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
-void ack_bad_irq(unsigned int irq);
 
 #define HARDIRQ_BITS	8
 

@@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq);
 # error HARDIRQ_BITS is too low!
 #endif
 
+#include <asm-generic/hardirq.h>
+
 #endif /* __ASM_HARDIRQ_H */

Index: linux-2.6/arch/cris/kernel/irq.c
===================================================================

arch/cris/kernel/irq.c +0 -0
@@ -38,11 +38,6 @@

arch/cris/kernel/irq.c line 43

Quoted 10 lines
arch/cris/kernel/irq.c +0 -5
 #include <asm/io.h>
 
-void ack_bad_irq(unsigned int irq)
-{
-	printk("unexpected IRQ trap at vector %02x\n", irq);
-}
-
 int show_interrupts(struct seq_file *p, void *v)
 {
 	int i = *(loff_t *) v, j;

Thanks! I found that the above change was not enough since CRIS had some extra (incorrect) prototypes for setup_irq that caused compile errors, so I've added the the following patch to the cris-tree:

From: Christoph Hellwig <[email protected]>
Subject: [PATCH] CRIS: convert to asm-generic/hardirq.h

Convert CRIS to use asm-generic/hardirq.h
Also remove unneeded (incorrect) prototypes for setup_irq().

Signed-off-by Christoph Hellwig <[email protected]>
Signed-off-by Jesper Nilsson <[email protected]>
---
 arch/cris/arch-v10/kernel/time.c |    1 -
 arch/cris/arch-v32/kernel/smp.c  |    2 --
 arch/cris/arch-v32/kernel/time.c |    1 -
 arch/cris/include/asm/hardirq.h  |   12 ++----------
 arch/cris/kernel/irq.c           |    5 -----
 5 files changed, 2 insertions(+), 19 deletions(-)
arch/cris/arch-v10/kernel/time.c +0 -1
index 2b73c7a..31ca141 100644
@@ -28,7 +28,6 @@
 
 extern void update_xtime_from_cmos(void);
 extern int set_rtc_mmss(unsigned long nowtime);
-extern int setup_irq(int, struct irqaction *);
 extern int have_rtc;
 
 unsigned long get_ns_in_jiffie(void)
arch/cris/arch-v32/kernel/smp.c +0 -2
index d2a3ff8..058addd 100644
@@ -52,8 +52,6 @@ static struct mm_struct* flush_mm;
 static struct vm_area_struct* flush_vma;
 static unsigned long flush_addr;
 
-extern int setup_irq(int, struct irqaction *);
-
 /* Mode registers */
 static unsigned long irq_regs[NR_CPUS] = {
   regi_irq,
arch/cris/arch-v32/kernel/time.c +0 -1
index 65633d0..b1920d8 100644
@@ -46,7 +46,6 @@ unsigned long timer_regs[NR_CPUS] =
 
 extern void update_xtime_from_cmos(void);
 extern int set_rtc_mmss(unsigned long nowtime);
-extern int setup_irq(int, struct irqaction *);
 extern int have_rtc;
 
 #ifdef CONFIG_CPU_FREQ
arch/cris/include/asm/hardirq.h +2 -10
index 74178ad..17bb12d 100644
@@ -2,16 +2,6 @@
 #define __ASM_HARDIRQ_H
 
 #include <asm/irq.h>
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
-void ack_bad_irq(unsigned int irq);
 
 #define HARDIRQ_BITS	8
 

@@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq);
 # error HARDIRQ_BITS is too low!
 #endif
 
+#include <asm-generic/hardirq.h>
+
 #endif /* __ASM_HARDIRQ_H */
arch/cris/kernel/irq.c +0 -5
index 7f642fc..0ca7d98 100644
@@ -38,11 +38,6 @@
 
 #include <asm/io.h>
 
-void ack_bad_irq(unsigned int irq)
-{
-	printk("unexpected IRQ trap at vector %02x\n", irq);
-}
-
 int show_interrupts(struct seq_file *p, void *v)
 {
 	int i = *(loff_t *) v, j;
Signature · 5 lines
1.6.1

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- [email protected]