diff --git a/src/dev/arm/gic_v3_redistributor.cc b/src/dev/arm/gic_v3_redistributor.cc
index 348cd96276..3039e1e55e 100644
--- a/src/dev/arm/gic_v3_redistributor.cc
+++ b/src/dev/arm/gic_v3_redistributor.cc
@@ -830,14 +830,14 @@ Gicv3Redistributor::update()
     }
 
     // Check LPIs
-    uint32_t largest_lpi_id = 1 << (lpiIDBits + 1);
+    const uint32_t largest_lpi_id = 1 << (lpiIDBits + 1);
     char lpi_pending_table[largest_lpi_id / 8];
     ThreadContext * tc = gic->getSystem()->getThreadContext(cpuId);
     tc->getVirtProxy().readBlob(lpiPendingTablePtr,
                                 (uint8_t *) lpi_pending_table,
                                 sizeof(lpi_pending_table));
     for (int lpi_id = SMALLEST_LPI_ID; lpi_id < largest_lpi_id;
-         largest_lpi_id++) {
+         lpi_id++) {
         uint32_t lpi_pending_entry_byte = lpi_id / 8;
         uint8_t lpi_pending_entry_bit_position = lpi_id % 8;
         bool lpi_is_pending = lpi_pending_table[lpi_pending_entry_byte] &