sched/topology: Add missing pieces of the fixes included in 3.16.49

Closes: #883938

I reviewed the upstream series of commits and found these that are
likely dependencies of the fixes I already applied in 3.16.49, not
just cleanup or optimisation.  Salvatore confirmed that together they
fixed the boot crash on one test system.