cpuinit: get rid of __cpuinit, manual fixups-2