revert hacks for the previous misuse of __cpuinit for hotplug only functions

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
Signed-off-by: Bryan Smith <zarboz@gmail.com>

Conflicts:
	mm/vmscan.c