Some changes in codegen needed by the new psci.