Skip to content

Commit

Permalink
m32r: convert to asm-generic/hardirq.h
Browse files Browse the repository at this point in the history
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Christoph Hellwig authored and Linus Torvalds committed Sep 22, 2009
1 parent 95ad759 commit ef187fd
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions arch/m32r/include/asm/hardirq.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@
#ifndef __ASM_HARDIRQ_H
#define __ASM_HARDIRQ_H

#include <linux/threads.h>
#include <linux/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 */
#include <asm/irq.h>

#if NR_IRQS > 256
#define HARDIRQ_BITS 9
Expand All @@ -26,11 +19,7 @@ typedef struct {
# error HARDIRQ_BITS is too low!
#endif

static inline void ack_bad_irq(int irq)
{
printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);
BUG();
}
#include <asm-generic/hardirq.h>

#endif /* __ASM_HARDIRQ_H */
#endif /* __KERNEL__ */

0 comments on commit ef187fd

Please sign in to comment.