Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0395ac64 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jesper Nilsson
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent e6cd1974

arch/cris/arch-v10/kernel/time.c

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;