Commit d668bf0a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Ungerer
Browse files

m68knommu: convert to asm-generic/hardirq.h 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent f3aa42c6

arch/m68k/include/asm/hardirq_no.h

+1 −9
Original line number Diff line number Diff line 
#ifndef __M68K_HARDIRQ_H

#define __M68K_HARDIRQ_H



#include <linux/cache.h>

#include <linux/threads.h>

#include <asm/irq.h>



typedef struct {

	unsigned int __softirq_pending;

} ____cacheline_aligned irq_cpustat_t;



#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */



#define HARDIRQ_BITS	8



/*
@@ -22,6 +14,6 @@ typedef struct { 
# error HARDIRQ_BITS is too low!

#endif



void ack_bad_irq(unsigned int irq);

#include <asm-generic/hardirq.h>



#endif /* __M68K_HARDIRQ_H */

arch/m68knommu/kernel/irq.c

+0 −5
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs) 
	set_irq_regs(oldregs);

}



void ack_bad_irq(unsigned int irq)

{

	printk(KERN_ERR "IRQ: unexpected irq=%d\n", irq);

}



static struct irq_chip m_irq_chip = {

	.name		= "M68K-INTC",

	.enable		= enable_vector,