diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c
index e18bc12faf4..56ff78f9b68 100644
--- a/sys/arm/arm/gic_acpi.c
+++ b/sys/arm/arm/gic_acpi.c
@@ -84,7 +84,7 @@ EARLY_DRIVER_MODULE(gic, acpi, gic_acpi_driver, 0, 0,
 struct madt_table_data {
 	device_t parent;
 	ACPI_MADT_GENERIC_DISTRIBUTOR *dist;
-	ACPI_MADT_GENERIC_INTERRUPT *intr[MAXCPU];
+	ACPI_MADT_GENERIC_INTERRUPT *intr[GIC_MAXCPU];
 };
 
 static void
@@ -107,7 +107,7 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg)
 		break;
 	case ACPI_MADT_TYPE_GENERIC_INTERRUPT:
 		intr = (ACPI_MADT_GENERIC_INTERRUPT *)entry;
-		if (intr->CpuInterfaceNumber < MAXCPU)
+		if (intr->CpuInterfaceNumber < GIC_MAXCPU)
 			madt_data->intr[intr->CpuInterfaceNumber] = intr;
 		break;
 	}
@@ -151,7 +151,7 @@ gic_acpi_identify(driver_t *driver, device_t parent)
 	}
 
 	intr = NULL;
-	for (i = 0; i < MAXCPU; i++) {
+	for (i = 0; i < GIC_MAXCPU; i++) {
 		if (madt_data.intr[i] != NULL) {
 			if (intr == NULL) {
 				intr = madt_data.intr[i];