diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 07:54:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 07:54:40 -0700 |
| commit | 9a8a0caddec7f77174a33e53f5ee9e87181b6232 (patch) | |
| tree | 01b63361ff4ecab67a5f3114298df494ebf143cf | |
| parent | vmstat: fix offset calculation on void* (diff) | |
| parent | m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h (diff) | |
| download | linux-dev-9a8a0caddec7f77174a33e53f5ee9e87181b6232.tar.xz linux-dev-9a8a0caddec7f77174a33e53f5ee9e87181b6232.zip | |
Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
m68knommu: add back in declaration of do_IRQ
| -rw-r--r-- | arch/m68k/include/asm/irqflags.h | 2 | ||||
| -rw-r--r-- | arch/m68k/include/asm/machdep.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/irqflags.h b/arch/m68k/include/asm/irqflags.h index 4a5b284a1550..7ef4115b8c4a 100644 --- a/arch/m68k/include/asm/irqflags.h +++ b/arch/m68k/include/asm/irqflags.h @@ -2,7 +2,9 @@ #define _M68K_IRQFLAGS_H #include <linux/types.h> +#ifdef CONFIG_MMU #include <linux/hardirq.h> +#endif #include <linux/preempt.h> #include <asm/thread_info.h> #include <asm/entry.h> diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h index 789f3b2de0e9..415d5484916c 100644 --- a/arch/m68k/include/asm/machdep.h +++ b/arch/m68k/include/asm/machdep.h @@ -40,5 +40,6 @@ extern unsigned long hw_timer_offset(void); extern irqreturn_t arch_timer_interrupt(int irq, void *dummy); extern void config_BSP(char *command, int len); +extern void do_IRQ(int irq, struct pt_regs *fp); #endif /* _M68K_MACHDEP_H */ |