Merge "ARM: gic: Refactor code for gic_configure_and_raise"