Skip to content

Commit

Permalink
m68k: make interrupt definitions conditional on correct CPU types
Browse files Browse the repository at this point in the history
The interrupt handling support defines and code is not so much conditional
on an MMU being present (CONFIG_MMU), as it is on which type of CPU we are
building for. So make the code conditional on the CPU types instead. The
current irq.h is mostly specific to the interrupt code for the 680x0 CPUs,
so it should only be used for them.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Matt Waddel <mwaddel@yahoo.com>
Acked-by: Kurt Mahan <kmahan@xmission.com>
  • Loading branch information
Greg Ungerer committed Dec 30, 2011
1 parent 8cee26f commit 78ccdff
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/m68k/include/asm/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
#define NR_IRQS 0
#endif

#ifdef CONFIG_MMU
#if defined(CONFIG_M68020) || defined(CONFIG_M68030) || \
defined(CONFIG_M68040) || defined(CONFIG_M68060)

/*
* Interrupt source definitions
Expand Down Expand Up @@ -80,7 +81,7 @@ extern unsigned int irq_canonicalize(unsigned int irq);

#else
#define irq_canonicalize(irq) (irq)
#endif /* CONFIG_MMU */
#endif /* !(CONFIG_M68020 || CONFIG_M68030 || CONFIG_M68040 || CONFIG_M68060) */

asmlinkage void do_IRQ(int irq, struct pt_regs *regs);
extern atomic_t irq_err_count;
Expand Down

0 comments on commit 78ccdff

Please sign in to comment.