Index: kernel/arch/arm32/include/mach/gta02/gta02.h
===================================================================
--- kernel/arch/arm32/include/mach/gta02/gta02.h	(revision 12b0d51de9d4343bcc2d442e78f69a0a65d854e6)
+++ kernel/arch/arm32/include/mach/gta02/gta02.h	(revision a2da43ce0270f2b1188a5e2ba61783c8c4e3bb13)
@@ -43,4 +43,7 @@
 extern struct arm_machine_ops gta02_machine_ops;
 
+/** Size of GTA02 IRQ number range (starting from 0) */
+#define GTA02_IRQ_COUNT 32
+
 #endif
 
Index: kernel/arch/arm32/include/mach/integratorcp/integratorcp.h
===================================================================
--- kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision 12b0d51de9d4343bcc2d442e78f69a0a65d854e6)
+++ kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision a2da43ce0270f2b1188a5e2ba61783c8c4e3bb13)
@@ -108,4 +108,7 @@
 extern struct arm_machine_ops icp_machine_ops;
 
+/** Size of IntegratorCP IRQ number range (starting from 0) */
+#define ICP_IRQ_COUNT 8
+
 #endif
 
Index: kernel/arch/arm32/include/mach/testarm/testarm.h
===================================================================
--- kernel/arch/arm32/include/mach/testarm/testarm.h	(revision 12b0d51de9d4343bcc2d442e78f69a0a65d854e6)
+++ kernel/arch/arm32/include/mach/testarm/testarm.h	(revision a2da43ce0270f2b1188a5e2ba61783c8c4e3bb13)
@@ -42,10 +42,8 @@
 #include <arch/machine_func.h>
 
-/** Last interrupt number (beginning from 0) whose status is probed
- * from interrupt controller
- */
-#define GXEMUL_IRQC_MAX_IRQ  8
-#define GXEMUL_KBD_IRQ       2
-#define GXEMUL_TIMER_IRQ     4
+/** Size of GXemul IRQ number range (starting from 0) */
+#define GXEMUL_IRQ_COUNT	32
+#define GXEMUL_KBD_IRQ		2
+#define GXEMUL_TIMER_IRQ	4
 
 /** Timer frequency */