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 <hch@lst.de>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
Christoph Hellwig 2009-08-04 16:49:52 +02:00 committed by Jesper Nilsson
parent e6cd19743b
commit 0395ac6447
5 changed files with 2 additions and 19 deletions

View File

@ -28,7 +28,6 @@
extern void update_xtime_from_cmos(void); extern void update_xtime_from_cmos(void);
extern int set_rtc_mmss(unsigned long nowtime); extern int set_rtc_mmss(unsigned long nowtime);
extern int setup_irq(int, struct irqaction *);
extern int have_rtc; extern int have_rtc;
unsigned long get_ns_in_jiffie(void) unsigned long get_ns_in_jiffie(void)

View File

@ -52,8 +52,6 @@ static struct mm_struct* flush_mm;
static struct vm_area_struct* flush_vma; static struct vm_area_struct* flush_vma;
static unsigned long flush_addr; static unsigned long flush_addr;
extern int setup_irq(int, struct irqaction *);
/* Mode registers */ /* Mode registers */
static unsigned long irq_regs[NR_CPUS] = { static unsigned long irq_regs[NR_CPUS] = {
regi_irq, regi_irq,

View File

@ -46,7 +46,6 @@ unsigned long timer_regs[NR_CPUS] =
extern void update_xtime_from_cmos(void); extern void update_xtime_from_cmos(void);
extern int set_rtc_mmss(unsigned long nowtime); extern int set_rtc_mmss(unsigned long nowtime);
extern int setup_irq(int, struct irqaction *);
extern int have_rtc; extern int have_rtc;
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ

View File

@ -2,16 +2,6 @@
#define __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H
#include <asm/irq.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 #define HARDIRQ_BITS 8
@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq);
# error HARDIRQ_BITS is too low! # error HARDIRQ_BITS is too low!
#endif #endif
#include <asm-generic/hardirq.h>
#endif /* __ASM_HARDIRQ_H */ #endif /* __ASM_HARDIRQ_H */

View File

@ -38,11 +38,6 @@
#include <asm/io.h> #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 show_interrupts(struct seq_file *p, void *v)
{ {
int i = *(loff_t *) v, j; int i = *(loff_t *) v, j;