Skip to content

Commit

Permalink
m68knommu: 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>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  • Loading branch information
Christoph Hellwig authored and Greg Ungerer committed Sep 15, 2009
1 parent f3aa42c commit d668bf0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
10 changes: 1 addition & 9 deletions arch/m68k/include/asm/hardirq_no.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
#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

/*
Expand All @@ -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 */
5 changes: 0 additions & 5 deletions arch/m68knommu/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d668bf0

Please sign in to comment.