Revert "Revert "ARM: gic: Bring inline with upstream""

This reverts commit e49d94e2ce2445d8e02634f7ca26a1294b25a84d.