patch-2.2.18 linux/include/asm-m68k/irq.h

Next file: linux/include/asm-m68k/keyboard.h
Previous file: linux/include/asm-m68k/init.h
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/include/asm-m68k/irq.h linux/include/asm-m68k/irq.h
@@ -12,14 +12,19 @@
 /*
  * This should be the same as the max(NUM_X_SOURCES) for all the
  * different m68k hosts compiled into the kernel.
- * Currently the Atari has 72 and the Amiga 24, but if both are
- * supported in the kernel it is better to make room for 72.
+ * Currently the Atari has 72, Mac has 64 and the Amiga 24; this
+ * makes sure there is room for the largest table needed by the
+ * architectures supported by the kernel.
  */
 #if defined(CONFIG_ATARI)
 #define NR_IRQS (72+SYS_IRQS)
 #else
+#if defined(CONFIG_MAC)
+#define NR_IRQS (64+SYS_IRQS)
+#else
 #define NR_IRQS (24+SYS_IRQS)
 #endif
+#endif
 
 /*
  * Interrupt source definitions
@@ -69,6 +74,7 @@
 
 extern void (*enable_irq)(unsigned int);
 extern void (*disable_irq)(unsigned int);
+#define disable_irq_nosync(i) disable_irq(i)
 
 extern int sys_request_irq(unsigned int, 
 	void (*)(int, void *, struct pt_regs *), 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)