tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 9a8a0cad ff8b16d7

+3
unified split
+2
arch/m68k/include/asm/irqflags.h
··· 2 #define _M68K_IRQFLAGS_H 3 4 #include <linux/types.h> 5 #include <linux/hardirq.h> 6 #include <linux/preempt.h> 7 #include <asm/thread_info.h> 8 #include <asm/entry.h>
··· 2 #define _M68K_IRQFLAGS_H 3 4 #include <linux/types.h> 5 + #ifdef CONFIG_MMU 6 #include <linux/hardirq.h> 7 + #endif 8 #include <linux/preempt.h> 9 #include <asm/thread_info.h> 10 #include <asm/entry.h>
+1
arch/m68k/include/asm/machdep.h
··· 40 extern irqreturn_t arch_timer_interrupt(int irq, void *dummy); 41 42 extern void config_BSP(char *command, int len); 43 44 #endif /* _M68K_MACHDEP_H */
··· 40 extern irqreturn_t arch_timer_interrupt(int irq, void *dummy); 41 42 extern void config_BSP(char *command, int len); 43 + extern void do_IRQ(int irq, struct pt_regs *fp); 44 45 #endif /* _M68K_MACHDEP_H */