Revert "ARM: gic: Bring inline with upstream"

This reverts commit 92c44ff6dc245aba0aba5b9817f553623048fd06.